AME-2812 / AME-2804 / OPENAM-3842 / CR-3363 / CR-3396

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