Merge "Remove static state and default beans from RuntimeMappingModuleFactory,SchemaS...