OPENAM-8645 Resolve various issues with AD and ADAM schema files
AME-6128 AME-6129 Reintegrating branch