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