Merge "Install etcdctl along with etcd3"