Merge "Have separate timeouts for upload by url ($wgCopyUpload[Async]Timeout)"