[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1902: Trying to clean up