Merge "Unstable test_server_connectivity_cold_migration_revert"