[ros-diffs] [cfinck] 36267: Fix some mistakes detected by a true XML parser