[ros-diffs] [tkreuzer] 48344: reduce diff to trunk