[ros-diffs] [akhaldi] 62287: * Sync up to trunk HEAD (r62286).