[ros-diffs] [tkreuzer] 52991: sync with trunk head (r52986)