[ros-diffs] [tkreuzer] 45067: remove diff to trunk