Merge branch '18995-code-cleanup-2'
authorWard Vandewege <ward@curii.com>
Fri, 15 Apr 2022 22:10:36 +0000 (18:10 -0400)
committerWard Vandewege <ward@curii.com>
Fri, 15 Apr 2022 22:10:36 +0000 (18:10 -0400)
refs #18995

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


Trivial merge