OPENAM-2254 CR-1398 fix

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@4608 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
OpenAM-2253 CR-1399 FIX

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