etcdserver: re-order ServerConfig fields

More logical to have the Cluster fields grouped together.