Issue #2236733 by eshta: Follow-up function signature change for option sets admin form.
Issue #2235277 by eshta: Fixed number of goals displayed on campaign edit page after save.