Merge xsd from upstream.