AME-246 CR-1228 FIX

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@4203 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
Fix for OPENAM-751, review CR-1239.

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