etcd: upgrade server and ctl

This fixes timeout errors on postStart on etcd.service.
Both upgrades in one commit because if you only upgrade etcd then service doesnt start because service is using etcdctl.