Issue #3228392: Fix various nits

Ted Bowman requested to merge issue/automatic_updates-3228392:3228392-fix-various-nits into 8.x-2.x Aug 16, 2021