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