[ros-diffs] [jimtabor] 19219: Fix xml name conflict.