Merge "Enable $wgCookieSetOnAutoblock and $wgCookieSetOnIpBlock by default"