[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16582: Data entry, option sets, using option set name as label and option set code as value to save