Merge pull request #7427 from eileenmcnaughton/CRM-17275-import