Merge "(y)etsin fixes, test refactoring, and misc fixes"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 8 Jun 2018 20:46:12 +0000 (20:46 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 8 Jun 2018 20:46:12 +0000 (20:46 +0000)

Trivial merge