Fix for OPENAM-4320, review via IM with PM

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