Fixes #6023 - Fixed code to associate gpg key to a product

The gpg key find method was botched in the lookup. Fixed it with a where clause and an org check