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