CR-4319, AME-4242

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