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