etcdserver: re-order ServerConfig fields
Merge pull request #1653 from jonboulle/server_order

etcdserver: re-order ServerConfig fields