ENG-5899 Empty rejoin test passes.
ENG-5899 Fix unit tests.
Merge branch 'master' of github.com:VoltDB/voltdb into ENG-5899
ENG-5899 Fix unit test more betterer.
Merge branch 'master' of github.com:VoltDB/voltdb into ENG-5899
ENG-5899 Review changes and rejoin fix.
ENG-5899 Untested review responses, join fix, and merge.

Merge branch 'master' of github.com:VoltDB/voltdb into ENG-5899

Conflicts:
	src/frontend/org/voltdb/iv2/RejoinProducer.java
ENG-5899 Fix ant junitclass when testobjects doesn't exist.
Merge branch 'master' of github.com:VoltDB/voltdb into ENG-5899
Merge branch 'master' of github.com:VoltDB/voltdb into ENG-5899
Merge pull request #1297 from VoltDB/ENG-5899

ENG-5899 Get empty catalog stuff working.