etcd/client: more changes