OpenAM-2501 CR-1863

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

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