[ros-diffs] [tkreuzer] 45077: reduce difference to trunk