Merge "Stop test from randomly failing"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 26 Mar 2018 17:25:13 +0000 (17:25 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 26 Mar 2018 17:25:13 +0000 (17:25 +0000)

Trivial merge