etcdserver: cleanup server.go
Merge pull request #2008 from xiang90/server_clean

etcdserver: cleanup server.go