[REF] auto-fix conventions

Signed-off-by: Sandy Carter <sandy.carter@savoirfairelinux.com>
Forward port branch '7.0-autofix-script-01-dev-moylop260' into 8.0