Fix up XML into a schema-compliant form
Merge pull request #55 from Metaswitch/xml_fixes

[No review required] XML fixes