Merge "enable xml tests test_disk_config"