etcdserver: refactor cluster and clusterStore

Integrate clusterStore into cluster, and let cluster become the source of
cluster info.

fixes #1354 

early feedback welcome
Please split this out into a function with an associated test. We have had >1 subtle bug in this exact code in the recent past.