Merge "Uncomment and fix a test"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 23 Mar 2018 10:51:03 +0000 (10:51 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 23 Mar 2018 10:51:03 +0000 (10:51 +0000)

Trivial merge