SENTRY-343 remove grantorPrincipal from Query