[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21880: Partial merge from folkehelsa