Merge "Make the wait_for_server_status timeout message a bit more clear"