Fix for OPENAM-3271, review CR-3597.

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