fix the valrgind failure on master. This will conflicts with Paul's changeset.
Merge pull request #1561 from VoltDB/fix-master-valgrind-problem

fix the valrgind failure on master. This will conflicts with Paul's chan...