Add "using" statements to util/masterelection.cc.
Convert etcd watchers to use util::Task.
Factor out a standalone EventPump for use in tests etc.