Merge "CookieSessionProvider: It's persisted if we have a 'Token' cookie"