These are fixes for some failures we had on test runners with testInvalidationBug or test_conflict_resolution:testConflictResolution that happens on machine when resolving "localhost" on dns takes 10 seconds.