Fix for OPENAM-4247

git-svn-id: https://svn.forgerock.org/openam/trunk@10130 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
Fix for OPENAM-4339

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