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

Also various smaller cleanups.
Missed a detail in my previous commit.

Does not really affect anything, but if we change the number of the modulo
for testing, it wouldn't do what you'd expect.
I'm a bit nutty, yes, leave me alone. :smiley: