Merge "Various fixes to make phan-taint-check happier"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 4 Mar 2019 03:36:32 +0000 (03:36 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 4 Mar 2019 03:36:32 +0000 (03:36 +0000)

Trivial merge