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