Now guards against a combo box having a value that is not present in the underlying collection.
When this happens and the combo box is readonly and mandatory, the optional option is added to the beginning of the list.
Authored by: keess 2015-04-14
Parent: [r2720]
Child: [r2722]
