Merge "wait_for_server_status(): report original request ID if failure"