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