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