Merge "Make ConfigurationXmlParser more stringent."