Donot - Merge - Fixes #5737

* Made gpg key index respect org boundaries
TBD
environments
orgs
....