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