Use an IP that we don't use for other nodes

Pull in changes from swift-solo