OPENAM-2021 CR-1916

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@5712 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
fix for AME-2015
https://bugster.forgerock.org/jira/browse/AME-2015
http://sources.forgerock.org/cru/CR-1937

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@5713 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d