OPENAM-7439
OPENAM-5755 CR-6733 Header fix for commit r13919
OPENAM-5755 CR-6733 Prevent duplicate metaAliases in SAML entities
Integrating AME-2372 branch part II: * Moving resources to their correct locations