AME-1983 - CR-2127 and CR-2128 changes to work with latest json-web-token library

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