Retry connections from slaves

Remote slaves now try to reconnect for a configurable number of seconds, defaulting to 30. This lets slaves bootstrap concurrently with a master, instead of the master bootstrapping, then sending out requests to slaves to bootstrap.
is run_id still required here?

can you do a quick s/run_id/token/ as well