Issue #2216605 by mradcliffe: Extend getEmptyOption() to return correct (non) options for non-required and required fields.