Changes based on review comments by IM from Gary Williams

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@7241 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
Fix for OPENAM-2975

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