Wait for dead brokers

@wkuranowski this might help with the dropping-messages-on-election problem (you may have to bump `WaitForElection` to 6 seconds though). It's kind of a shot in the dark though, so it might now work.