ENG-4291 (final?) Expression-level refactoring of getVoltXML
Merge branch 'master' into ENG-4291-expressions
Merge branch 'master' into ENG-4291-expressions
Merge pull request #370 from VoltDB/ENG-4291-expressions

Eng 4291 Final Expression-level refactoring phase, passes jenkins