[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2175: Applied patch from Tran on patient module aggregation engine