[ros-diffs] [tkreuzer] 41479: Remove usage of RETURN() macro