Issue #2283759 followup: fixing support for image fields
CH-559: First pass at converting option sets to entities
Invoke entity hooks on option set save
Add UUID field