Merge pull request #3546 from eileenmcnaughton/4.4

CRM-14903 alter enum field on civicrm_mapping_field to reflect allowed o...
CRM-14903 fix REGEX to RLIKE