Merge "Improve error msg of wait_for_server_status waiter"