Fix selecting item by string if its a ComboBox Items list
Fix selecting item by string if its a ComboBox Items list

Enabled again setting it by display string value (Items) and returning
it.  If datasource is set, you get objects back

jeoffman/EDDiscovery,mwerle/EDDiscovery,vendolis/EDDiscovery,mwerle/EDDiscovery,jeoffman/EDDiscovery,jthorpe4/EDDiscovery,vendolis/EDDiscovery,jgoode/EDDiscovery,jgoode/EDDiscovery