Try to simplify the wait_for_bootstrap logic

Can we make the wait_for_bootstrap logic any simpler? Ideally we wouldn't have to look at the bootstrap status; we could just watch whether the Event has triggered. Or maybe a futures::Mutex would be just what we need.