Disable DR 2 again, and update tests that depends on it to explicity turn it on
Use Paul's suggestion to output simple version of INLINE explain string
Merge pull request #1499 from VoltDB/ENG-6590-inline-limit-for-aggregate

Eng 6590 inline limit for aggregate
Merge branch 'master' of github.com:VoltDB/voltdb into ENG-6591-partial-aggregate