[ros-diffs] [mbosma] 25554: Merge xml changes to 0.3.1 branch.