Fix for OPENAM-4021 - review: FR-200


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