Merge "Fix test_basic_metadata_definition_namespaces"