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