ENG-5975: Fix bug where the rejoin watchdog doesn't get canceled on time.
When one partition is done, it starts a 60s timer to kill the cluster. The other partitions have essentially 60s to finish.
Merge remote-tracking branch 'origin/master' into ENG-5975-rejoinfail
ENG-5975: Second crack at fixing the timeouts issue.
Not totally done, but will test with this.
ENG-5975: Refining the fix and adding debug output.
ENG-5975: Fix no-compile dumbness.
ENG-5975: Trying fix #3.
ENG-5975: Cleanup and polish.
Merge remote-tracking branch 'origin/master' into ENG-5975-rejoinfail
ENG-5975: Remove more debug code.
Merge remote-tracking branch 'origin/master' into ENG-5975-rejoinfail
Merge pull request #1275 from VoltDB/ENG-5975-rejoinfail

ENG-5975: Fix bug where the rejoin watchdog doesn't get canceled on time...