etcdserver: address more comments