OpenAM-1887 CR-1559

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@5062 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
CR-1551. AME-1106.

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@5063 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
CR-1553. AME-1494.

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@5064 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
CR-1560. AME-1215

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