ENG-7337 added max java heap to memory statistics
ENG-7337 updated junit test and moved column
Merge pull request #1874 from VoltDB/ENG-7337

ENG-7337 added max java heap to memory statistics
Merge remote-tracking branch 'upstream/master'