Fix for OPENAM-2644, review CR-1994.

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@5921 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
Fix for OPENAM-2212, review CR-1998.

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