ENG-5599: 2gb everywhere.
Merge branch 'master' into ENG-5599
Merge pull request #1030 from VoltDB/ENG-5599

ENG-5599: 2gb everywhere.