Merge "More quick fixes for mw.ForeignUpload"