Use sessionStorage for the Local Context instead of Cookie by default
Fix handling of sessionStorage for the Local Context
Remove sessionStorage on logout and doesn't set unnecessary cookies on loading a page
Conflict resolved
Merge branch 'use-sessionstorage-for-localcontext'

Conflict resolved.