[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17878: Detailed eta-data export, including option combos when exporting category combos