[ros-diffs] [hpoussin] 20193: Merge from trunk: