CRM-15140 - port further metadata fixes