[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18999: put back the change which broke the test, though not the right solution. Should find the proper s...