Fix for OPENAM-3731, review CR-3937

git-svn-id: https://svn.forgerock.org/openam/trunk@9562 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
Fix for OPENAM-4060, review FR-218.

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