[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11928: Migrating CCEM to trunk