Add etcdctl in master

Should resolve #1549