Merge "Include miscellaneous query parameters in $wgSecureLogin redirect"