Merge "Remove duplicate ServiceWiring definitions"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 24 Dec 2017 15:01:11 +0000 (15:01 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 24 Dec 2017 15:01:11 +0000 (15:01 +0000)

Trivial merge