[MONDRIAN-1770] Merge the SQL-92 branch into the lagunitas branch.

This merges Julian's queryBuilder branch back to lagunitas, which primarily consisted of changes in commits 89aed08 and 8e2d4f78.