Merge "(bug 37249) validate export-demo.xml against current export.xsd"