Merge "test_server_metadata.py - BP add-xml-support"