[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2584: Previous refactoring went to fast (forgot about CategoryOptionCombo), so refactored some more to ...