DRILL-195 Updates to Antlr expression parser for 'or', 'and' and supporting function implementations.
DRILL-192 Load fix