Sync gettextutils from oslo

Some Messages use a Message within a Message, and we were only
translating the base Message but not the Message substitution within.

Fixes bug: #1221808

Change-Id: Ic3119df23a090cfaa160c1461e955f0af55fe1cf
Ensure any relevant tokens are revoked when a role is deleted

Add a controller class method to delete tokens for a role, along the
lines of those that exist for deleting tokens for user and project. Ensure
this is called for both the V2 and V3 delete_role APIs.

Fixes bug 1153645

Change-Id: I3c8d70eeb387a18c30df489142ea3aefc2224ae3
Add user to project if project ID is changed

When an user updates project ID, it is necessary to make sure
the new tenant is available.

Remove the member role from the old tenant.

Add the member role to the new tenant.

Fixes bug 1201251

Change-Id: I0c2c8971039f567180fd910e959e4a1f0574034d
Merge "Sync gettextutils from oslo"
Merge "Ensure any relevant tokens are revoked when a role is deleted"
Merge "Add user to project if project ID is changed"