Fix #8141 Don't refer to 'custom-setup' as 'optional' (#10073)

Also uses 'stanza' consistently in that context.

(cherry picked from commit 2e8d7286)

Co-authored-by: Mike Pilgrem <mpilgrem@users.noreply.github.com>