Merge "Make `ApiUploadTest` up to date so it passes"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 25 Sep 2017 16:11:01 +0000 (16:11 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 25 Sep 2017 16:11:01 +0000 (16:11 +0000)

Trivial merge