[sr-dev] git:master:f1abcba4: ims_charging: updates for lib/ims macro names