Merge "Remove wait_for_server_status from servers_client"