Merge branch '16955-more-fixes' into master
authorWard Vandewege <ward@curii.com>
Thu, 8 Oct 2020 01:24:28 +0000 (21:24 -0400)
committerWard Vandewege <ward@curii.com>
Thu, 8 Oct 2020 01:24:56 +0000 (21:24 -0400)
refs #16955

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


Trivial merge