[ros-diffs] [tkreuzer] 45071: reduce differences to trunk