etcd: upgrade server and ctl
Merge pull request #5497 from matejc/fixetcd

etcd: upgrade server and ctl