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