[ros-diffs] [jjones] 59398: Sync by merging from trunk.