Fix path to etcd
Update to all the V2 API changes