Merge "(bug 35264) Wrong type used for <ns> in export.xsd"