change machine to v1/machine
Merge https://github.com/xiangli-cmu/go-etcd