For ENG-6636, fix broken TPC-C compile
For ENG-6644, fix broken full memcheck tests
For ENG-6653, don't DR data deleted by elastic rebalance.
Merge pull request #1518 from VoltDB/ENG-6644

For ENG-6644, fix broken full memcheck tests
Merge pull request #1519 from VoltDB/ENG-6653

For ENG-6653, don't DR data deleted by elastic rebalance.