[ros-diffs] [sginsberg] 36351: - Fix CMTRACE macro