Merge "Ensure disabled deprecation warnings are re-enabled before next test"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 25 Sep 2018 17:13:14 +0000 (17:13 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 25 Sep 2018 17:13:14 +0000 (17:13 +0000)

Trivial merge