[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16568: Option set, fixed bug, ui returned name in use when code should be returned