OpenAM-2582 CR-1914

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@5640 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
OpenAM-2609 CR-1915

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@5641 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
OpenAM-2021 CR-1916

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