[ros-diffs] [tfaber] 70322: [0.4.0] - Sync up to trunk r70321