ENG-5591: Don't add the rejoin sites/host heap cost with k=0
ENG-5591: Repair heap size settings so that junit tests satisfy the
crazy threshold and actually start and run.
Merge pull request #1086 from VoltDB/eng5591

Eng5591