Merge "Skip test_server_connectivity_cold_migration_revert until fixed"