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