OPENAM-2444 CR-1658

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@5215 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
OPENAM-2447 CR-1657

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@5216 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
OpenAM-2449 CR-1660 fix

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