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