OpenAM-2406 CR-1641 fix

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@5200 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
Bug: OPENAM-2316 Review: CR-1645

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