Merge "Make etcd3 setup work with IPv6 addresses"