This fixes #7366.  I added unit testing for the xml file.  It just tests that the XML file is correct.
This is the rest of the files that fix #7366.
This fixes #7365.  The build system now works completely.