Prevent some memory pooling discovered via eclipse MAT applied to sqlcoverage and junit OOMs
Merge branch 'master' into java_mem_tuning
Limit catalog buffer pooling
Tweak comment.
Remove obsoleted m_serializedCatalog member
Redo Web Studio command and parameter parser/splitters.
Merge branch 'master' into ENG-5955-studio
Merge branch 'master' into ENG-5955-studio
Update queryui.js
Update queryui.js
Remove VoltDBEngine details out of the header included everywhere. Tighten up TempTableLimits.
Merge branch 'master' into cleanup-VoltDBEngine.h
Merge branch 'master' into cleanup-VoltDBEngine.h
One-liner for OSX compiler fussiness
Merge branch 'master' into cleanup-VoltDBEngine.h

Conflicts:
	src/ee/execution/VoltDBEngine.h
	src/ee/storage/TempTableLimits.cpp
	src/ee/storage/TempTableLimits.h
Merge branch 'master' into cleanup-VoltDBEngine.h
Merge branch 'master' into cleanup-VoltDBEngine.h
Merge branch 'master' into java_mem_tweaked

Conflicts:
	src/frontend/org/voltdb/planner/PlanSelector.java
Merge pull request #1444 from VoltDB/cleanup-VoltDBEngine.h

Cleanup volt db engine.h
Allow specifying the AMI ID in the CloudFormation template generator.