Merge "Various fixes for phan-taint-check"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 20 Feb 2019 03:07:24 +0000 (03:07 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 20 Feb 2019 03:07:24 +0000 (03:07 +0000)

Trivial merge