[Branch ~dhis2-devs-core/dhis2/trunk] Rev 546: update missing code