Session: revert to displaying time that session expires
Merge pull request #3439 from patheard/session-timeout

Session: revert to displaying time that session expires
Resolve merge conflict