[sr-dev] git:master:14699865: tm: more log macros migrated from old form with location info in message