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

For ENG-6644, fix broken full memcheck tests