Fix compile problem in Query Validator.
Merge branch 'master' into two-dot-o
Fixing merge issues in query validator, still fighting a compile error in the tests.