[ros-diffs] [tkreuzer] 36570: remove duplicate definitions