Merge branch '11901-ws-db-conns'
authorTom Clegg <tom@curoverse.com>
Tue, 27 Jun 2017 18:02:10 +0000 (14:02 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 27 Jun 2017 18:02:10 +0000 (14:02 -0400)
closes #11901

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>


Trivial merge