[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18430: Fixed bug in Aggregate query builder formula and a small fix in Individual records.