Merge "(bug 29898) Set cookie to force HTTPS from HTTP"