Fix for OPENAM-4213 - review: CR-4201 Improved error handling for SAML metadata import failures.
Fix for AME-202 - review: CR-802