[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3167: (local vn) Excel reporting - Reorganized code.