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