CRM-14183 xml directory changes