etcdserver: cleanup cluster.go
Merge pull request #2007 from xiang90/cluster_clean

etcdserver: cleanup cluster.go