SENTRY-447: Fix thrift generated code related to grantor principal cleanup (Sravya Tirukkovalur via Prasad Mujumdar)