Merge "Remove two deprecated functions and one depreciated variable in a function...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 22 Aug 2017 23:25:57 +0000 (23:25 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 22 Aug 2017 23:25:57 +0000 (23:25 +0000)

Trivial merge