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