Fix for OPENAM-4029 - review: CR-3748
These changes were most likely accidentally introduced with AME-3114.

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