Merge "Ability to define service_token_roles"