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
Revert snapshot debug messages to the debug level.
ENG-6057: Use the VoltTableRow method that preserves milliseconds when
converting to java.sql.Timestamp rather than old broken cowboy logic.
Merge pull request #1289 from VoltDB/eng6057

ENG-6057: Use the VoltTableRow method that preserves milliseconds when converting to java.sql.Timestamp rather than old broken cowboy logic.

r=rbetts (YES, RUN!)
ENG-6158: Set the elastic index as complete on the new table after truncation.

The new table is empty, so nothing to index. Mark it as complete so that
subsequent index reads can succeed.
Merge pull request #1290 from VoltDB/truncate-table-fix

ENG-6158: Set the elastic index as complete on the new table after truncation
ENG-6158: Build the elastic index during ElasticContext cloning.

There might be tuples in the new table by the time the elastic context is
cloned. We need to build the index so that the tuples can be included.
Add missing break
Merge pull request #1291 from VoltDB/truncate-table-fix

ENG-6158: Build the elastic index during ElasticContext cloning.
Merge pull request #1275 from VoltDB/ENG-5975-rejoinfail

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