[ros-diffs] [tkreuzer] 60828: Sync with trunk (r60786)