etcdserver: force new cluster

@jonboulle it would be great if you can do a quick review. i will continue to clean this up and write tests.
Nit, swap this with the next line