Merge pull request #1359 from VoltDB/ENG-6292-memory

Eng 6292 memory
Merge branch 'master' of github.com:VoltDB/voltdb into ENG-5938-upsert