Merge "Adds XML support to test_live_block_migration.py"