Merge "Add etcd single server installation"