Implement session expiry feature for clients that do not support cookies
Add test for session expiry
Merge branch 'session_expiry'