Merge "Fix for CookieStoreImpl and more tests around Cookie handling"