OPENAM-2268 CR-1415

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@4670 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
Fix for OPENAM-2243. CR-1420. CR-1421.

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