Merge "Use $wgSecureCookie to decide whether to actually mark secure cookies as ...