SENTRY-38 - Cleanup Roles/DBRoles (Gregory Chanan via Brock Noland)