Merge branch '18995-code-cleanup-4'
authorWard Vandewege <ward@curii.com>
Fri, 15 Apr 2022 20:22:24 +0000 (16:22 -0400)
committerWard Vandewege <ward@curii.com>
Fri, 15 Apr 2022 20:22:43 +0000 (16:22 -0400)
refs #18995

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


Trivial merge