[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2418: Ported user group functionality to user maintainance and tried to clean up a bit