removing unused keyid argument from verify function.  reorganizing the argument order to ensure text can be passed as first argument.
Merge pull request #15823 from garethgreenaway/fixing_gpg_verify

fixes to gpg module