AME-3538, AME-3539, CR-3797, CR-3849

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@9415 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
OPENAM-2451: CR-3840: Cleanup after session upgrade via REST

git-svn-id: https://svn.forgerock.org/openam/trunk/openam@9416 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
OPENAM-3879 CR-3861 Scope openid now set during OpenID Connect client registration

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