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