Merge "Support losing the upstream in IpServerTest."