CRM-14449 give up on fixing last 2 entities
Merge pull request #3073 from eileenmcnaughton/CRM-14449

CRM-14449 give up on fixing last 2 entities