[ros-diffs] [gedmurphy] 22480: change macros to call correct version