CR-1729. OPENAM-2483.

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