[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1897: after migrating to eclipse