[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11658: Merging CCEM modules from 2.11 to 2.13