Merge "Removing a depreceted method: xmlSchemaCleanupTypes"