CRM-13550 - API - Improve validation of options
Merge pull request #1825 from colemanw/4.3

CRM-13550 - API - Improve validation of options