[ros-diffs] [akhaldi] 72069: * Sync up to trunk HEAD (r72068)