Merge branch '13697-database-timeout'
authorTom Clegg <tom@curii.com>
Thu, 23 Sep 2021 21:01:53 +0000 (17:01 -0400)
committerTom Clegg <tom@curii.com>
Thu, 23 Sep 2021 21:01:53 +0000 (17:01 -0400)
fixes #13697

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


Trivial merge