Merge "Various test fixes for postgres"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 20 May 2017 19:11:35 +0000 (19:11 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 20 May 2017 19:11:35 +0000 (19:11 +0000)

Trivial merge