[releng] PR #6990: Various non-critical fixes for the two-week-atomic-host script