[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19239: minor refactor in Query, introduce Criterion as super class of expressions, first step to adding ...