Merge "Support losing the upstream in IpServerTest." into rvc-dev