Merge "fix xsd generation when obj crosses oxm files"