CRM-14288 - Remove obsolete custom field hack
HR-322 - Ensure customFieldOptions hook is always called for custom fields
Merge pull request #2817 from colemanw/custom

HR-322 - Ensure customFieldOptions hook is always called for custom fields