etcdserver: rebase on master and code clean