Revise gpg stanza order and parameters

References: #5971
Merge pull request #5975 from rolandwalker/gpg_dsl_revise

Revise gpg stanza order and parameters