AME-338 Fix

git-svn-id: https://svn.forgerock.org/openam@4139 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
branching trunk to work on openid connect

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