CRM-15140 - port further metadata fixes
Merge pull request #209 from eileenmcnaughton/7.x-4.4

CRM-15140 - port further metadata fixes