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