Merge "Fix escaping of pattern in export-0.8.xsd"