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