Merge "Move CookieJar class to own file"