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

Also various smaller cleanups.
This was commented out before, but doesn't seem to hurt?