Merge "Move wait_for_server_termination from servers_client"