OPENAM-2231 fix

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@4463 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
OPENAM-2231 Code Review fixes.

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