AME-1656, Incorporate suggestions; CR-1568

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@5130 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
AME-1656, Incorporate suggestions; CR-1568

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