Fix for OPENAM-3353

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@7477 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
Fix for OPENAM-2767, review CR-2649

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