Clean up XML to remove java style comments

Also make sure there is a newline at the end of the file
Merge pull request #6520 from stuartwdouglas/clean-up-xml

Clean up XML to remove java style comments