fixes OPENAM-3995

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

git-svn-id: https://svn.forgerock.org/openam/trunk@9016 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
fixes OPENAM-3995 (amended)

git-svn-id: https://svn.forgerock.org/openam/trunk@9017 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
fixes OPENAM-3626 (amended)

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