[Branch ~dhis2-devs-core/dhis2/trunk] Rev 9877: Made the assocation between category and category option many-to-many. No db change.