AME-4298, CR-4390 - Merge changes from trunk

git-svn-id: https://svn.forgerock.org/openam/branches/AME-3423@10405 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
AME-4298, CR-4390 - Ensure existing Session timer is cancelled before starting reduced crosstalk purge delay timer

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