Merge "[search] Remove more dead code"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 8 Nov 2016 18:19:13 +0000 (18:19 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 8 Nov 2016 18:19:13 +0000 (18:19 +0000)

Trivial merge