[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2060: Applied patch from Tran on excel-reporting