[ros-diffs] [tkreuzer] 36696: remove a RETURN() macro