Make it easy to run the masterelection_test with a real etcd.

Also various smaller cleanups.
Yeah, it should work both ways.
Could make it a feature and wrap this line in `if (round % 2 == 0) {...}` or something ? :)