Merge "Avoid false positives with test_server_connectivity_live_migration"