Merge "Narrow race in wait_for_server_status()."