Session timeout: Manually merged in fixes from pull request #2897.
Merge pull request #3017 from pjackson28/sessiontimeoutfixes

Session timeout: Manually merged in fixes from pull request #2897.
Merge branch 'v3.0'