CR-1691. OPENAM-2277.

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@5281 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
Bug: OPENAM-1502 Review: CR-1692

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