Merge "services/security/roled/internal: Remove _role suffix from generated blessings"