[Branch ~dhis2-devs-core/dhis2/trunk] Rev 412: Code optimization in ExpressionService