Fixes #5835 - Made gpg key index respect org boundaries

Made gpg key index  call respect org boundaries