[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1403: Improved handling of dataelement/category and datavalue/categoryoptincombo in dhis14 xml import