Merge "Revert "Remove some remaining mentions of unstubbing from core""
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 5 Oct 2017 17:47:29 +0000 (17:47 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 5 Oct 2017 17:47:29 +0000 (17:47 +0000)

Trivial merge