Merge "Various database class cleanups"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 23 Aug 2016 04:23:26 +0000 (04:23 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 23 Aug 2016 04:23:26 +0000 (04:23 +0000)

Trivial merge