[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16: Forgot to add two classes.