CRM-13086 Api improvements to support webform_civicrm 4