Merge branch '16328-keep-proxy-uses-config.yaml-to-find-keepstores'
authorWard Vandewege <ward@jhvc.com>
Wed, 22 Apr 2020 01:34:47 +0000 (21:34 -0400)
committerWard Vandewege <ward@jhvc.com>
Wed, 22 Apr 2020 01:34:47 +0000 (21:34 -0400)
closes #16328

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@jhvc.com>


Trivial merge