Merge mediawiki.legacy.upload into mediawiki.special.upload

Bug: 31946
Change-Id: Iba7d5a655847f00dde8f11c46dfc13f43b610433
Merge "Merge mediawiki.legacy.upload into mediawiki.special.upload"