diff --git a/keystone/locale/de/LC_MESSAGES/keystone-log-info.po b/keystone/locale/de/LC_MESSAGES/keystone-log-info.po
index 09a2d93486..8687f5450b 100644
--- a/keystone/locale/de/LC_MESSAGES/keystone-log-info.po
+++ b/keystone/locale/de/LC_MESSAGES/keystone-log-info.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-02-07 06:03+0000\n"
-"PO-Revision-Date: 2015-02-06 22:14+0000\n"
+"POT-Creation-Date: 2015-02-13 06:03+0000\n"
+"PO-Revision-Date: 2015-02-12 12:02+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/keystone/language/"
 "de/)\n"
@@ -45,28 +45,28 @@ msgstr ""
 msgid "Running command - %s"
 msgstr ""
 
-#: keystone/common/wsgi.py:77
+#: keystone/common/wsgi.py:78
 msgid "No bind information present in token"
 msgstr ""
 
-#: keystone/common/wsgi.py:81
+#: keystone/common/wsgi.py:82
 #, python-format
 msgid "Named bind mode %s not in bind information"
 msgstr ""
 
-#: keystone/common/wsgi.py:88
+#: keystone/common/wsgi.py:89
 msgid "Kerberos credentials required and not present"
 msgstr ""
 
-#: keystone/common/wsgi.py:92
+#: keystone/common/wsgi.py:93
 msgid "Kerberos credentials do not match those in bind"
 msgstr ""
 
-#: keystone/common/wsgi.py:96
+#: keystone/common/wsgi.py:97
 msgid "Kerberos bind authentication successful"
 msgstr ""
 
-#: keystone/common/wsgi.py:103
+#: keystone/common/wsgi.py:104
 #, python-format
 msgid "Couldn't verify unknown bind: {%(bind_type)s: %(identifier)s}"
 msgstr ""
@@ -103,7 +103,7 @@ msgid ""
 "%(resource_type)s, operation %(operation)s payload %(payload)s"
 msgstr ""
 
-#: keystone/openstack/common/eventlet_backdoor.py:147
+#: keystone/openstack/common/eventlet_backdoor.py:146
 #, python-format
 msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
 msgstr "Eventlet backdoor hört auf %(port)s für Prozess %(pid)d"
@@ -113,55 +113,55 @@ msgstr "Eventlet backdoor hört auf %(port)s für Prozess %(pid)d"
 msgid "Can not find policy directory: %s"
 msgstr ""
 
-#: keystone/openstack/common/service.py:174
+#: keystone/openstack/common/service.py:173
 #, python-format
 msgid "Caught %s, exiting"
 msgstr "%s abgefangen. Vorgang wird beendet"
 
-#: keystone/openstack/common/service.py:232
+#: keystone/openstack/common/service.py:231
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 "Übergeordneter Prozess wurde unerwartet abgebrochen. Vorgang wird beendet"
 
-#: keystone/openstack/common/service.py:263
+#: keystone/openstack/common/service.py:262
 #, python-format
 msgid "Child caught %s, exiting"
 msgstr "Untergeordnetes Element %s abgefangen; Vorgang wird beendet"
 
-#: keystone/openstack/common/service.py:302
+#: keystone/openstack/common/service.py:301
 msgid "Forking too fast, sleeping"
 msgstr "Verzweigung zu schnell; im Ruhemodus"
 
-#: keystone/openstack/common/service.py:321
+#: keystone/openstack/common/service.py:320
 #, python-format
 msgid "Started child %d"
 msgstr "Untergeordnetes Element %d gestartet"
 
-#: keystone/openstack/common/service.py:331
+#: keystone/openstack/common/service.py:330
 #, python-format
 msgid "Starting %d workers"
 msgstr "Starten von %d Workers"
 
-#: keystone/openstack/common/service.py:348
+#: keystone/openstack/common/service.py:347
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr "Untergeordnetes Element %(pid)d durch Signal %(sig)d abgebrochen"
 
-#: keystone/openstack/common/service.py:352
+#: keystone/openstack/common/service.py:351
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr "Untergeordnete %(pid)s mit Status %(code)d beendet"
 
-#: keystone/openstack/common/service.py:391
+#: keystone/openstack/common/service.py:390
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr "%s abgefangen, untergeordnete Elemente werden gestoppt"
 
-#: keystone/openstack/common/service.py:400
-msgid "Wait called after thread killed.  Cleaning up."
-msgstr "Warten aufgerufen nach dem der Thread abgebrochen wurde. Bereinige."
+#: keystone/openstack/common/service.py:399
+msgid "Wait called after thread killed. Cleaning up."
+msgstr ""
 
-#: keystone/openstack/common/service.py:416
+#: keystone/openstack/common/service.py:415
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "Warten auf Beenden von %d untergeordneten Elementen"
diff --git a/keystone/locale/en_GB/LC_MESSAGES/keystone-log-info.po b/keystone/locale/en_GB/LC_MESSAGES/keystone-log-info.po
index c628b58c63..056e354fb2 100644
--- a/keystone/locale/en_GB/LC_MESSAGES/keystone-log-info.po
+++ b/keystone/locale/en_GB/LC_MESSAGES/keystone-log-info.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-02-07 06:03+0000\n"
-"PO-Revision-Date: 2015-02-06 22:14+0000\n"
+"POT-Creation-Date: 2015-02-13 06:03+0000\n"
+"PO-Revision-Date: 2015-02-12 12:02+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "keystone/language/en_GB/)\n"
@@ -48,28 +48,28 @@ msgstr ""
 msgid "Running command - %s"
 msgstr ""
 
-#: keystone/common/wsgi.py:77
+#: keystone/common/wsgi.py:78
 msgid "No bind information present in token"
 msgstr ""
 
-#: keystone/common/wsgi.py:81
+#: keystone/common/wsgi.py:82
 #, python-format
 msgid "Named bind mode %s not in bind information"
 msgstr ""
 
-#: keystone/common/wsgi.py:88
+#: keystone/common/wsgi.py:89
 msgid "Kerberos credentials required and not present"
 msgstr ""
 
-#: keystone/common/wsgi.py:92
+#: keystone/common/wsgi.py:93
 msgid "Kerberos credentials do not match those in bind"
 msgstr ""
 
-#: keystone/common/wsgi.py:96
+#: keystone/common/wsgi.py:97
 msgid "Kerberos bind authentication successful"
 msgstr ""
 
-#: keystone/common/wsgi.py:103
+#: keystone/common/wsgi.py:104
 #, python-format
 msgid "Couldn't verify unknown bind: {%(bind_type)s: %(identifier)s}"
 msgstr ""
@@ -106,7 +106,7 @@ msgid ""
 "%(resource_type)s, operation %(operation)s payload %(payload)s"
 msgstr ""
 
-#: keystone/openstack/common/eventlet_backdoor.py:147
+#: keystone/openstack/common/eventlet_backdoor.py:146
 #, python-format
 msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
 msgstr "Eventlet backdoor listening on %(port)s for process %(pid)d"
@@ -116,54 +116,54 @@ msgstr "Eventlet backdoor listening on %(port)s for process %(pid)d"
 msgid "Can not find policy directory: %s"
 msgstr ""
 
-#: keystone/openstack/common/service.py:174
+#: keystone/openstack/common/service.py:173
 #, python-format
 msgid "Caught %s, exiting"
 msgstr "Caught %s, exiting"
 
-#: keystone/openstack/common/service.py:232
+#: keystone/openstack/common/service.py:231
 msgid "Parent process has died unexpectedly, exiting"
 msgstr "Parent process has died unexpectedly, exiting"
 
-#: keystone/openstack/common/service.py:263
+#: keystone/openstack/common/service.py:262
 #, python-format
 msgid "Child caught %s, exiting"
 msgstr "Child caught %s, exiting"
 
-#: keystone/openstack/common/service.py:302
+#: keystone/openstack/common/service.py:301
 msgid "Forking too fast, sleeping"
 msgstr "Forking too fast, sleeping"
 
-#: keystone/openstack/common/service.py:321
+#: keystone/openstack/common/service.py:320
 #, python-format
 msgid "Started child %d"
 msgstr "Started child %d"
 
-#: keystone/openstack/common/service.py:331
+#: keystone/openstack/common/service.py:330
 #, python-format
 msgid "Starting %d workers"
 msgstr "Starting %d workers"
 
-#: keystone/openstack/common/service.py:348
+#: keystone/openstack/common/service.py:347
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr "Child %(pid)d killed by signal %(sig)d"
 
-#: keystone/openstack/common/service.py:352
+#: keystone/openstack/common/service.py:351
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr "Child %(pid)s exited with status %(code)d"
 
-#: keystone/openstack/common/service.py:391
+#: keystone/openstack/common/service.py:390
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr "Caught %s, stopping children"
 
-#: keystone/openstack/common/service.py:400
-msgid "Wait called after thread killed.  Cleaning up."
-msgstr "Wait called after thread killed.  Cleaning up."
+#: keystone/openstack/common/service.py:399
+msgid "Wait called after thread killed. Cleaning up."
+msgstr ""
 
-#: keystone/openstack/common/service.py:416
+#: keystone/openstack/common/service.py:415
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "Waiting on %d children to exit"
diff --git a/keystone/locale/fr/LC_MESSAGES/keystone-log-info.po b/keystone/locale/fr/LC_MESSAGES/keystone-log-info.po
index 90a7f581e7..ab2afc92ff 100644
--- a/keystone/locale/fr/LC_MESSAGES/keystone-log-info.po
+++ b/keystone/locale/fr/LC_MESSAGES/keystone-log-info.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-02-07 06:03+0000\n"
-"PO-Revision-Date: 2015-02-06 22:14+0000\n"
+"POT-Creation-Date: 2015-02-13 06:03+0000\n"
+"PO-Revision-Date: 2015-02-12 12:02+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/keystone/language/"
 "fr/)\n"
@@ -50,29 +50,29 @@ msgstr ""
 msgid "Running command - %s"
 msgstr "Exécution de la commande %s"
 
-#: keystone/common/wsgi.py:77
+#: keystone/common/wsgi.py:78
 msgid "No bind information present in token"
 msgstr "Aucune information d'attachement n'est présente dans le jeton"
 
-#: keystone/common/wsgi.py:81
+#: keystone/common/wsgi.py:82
 #, python-format
 msgid "Named bind mode %s not in bind information"
 msgstr ""
 "Le mode d'attachement nommé %s n'est pas dans l'information d'attachement"
 
-#: keystone/common/wsgi.py:88
+#: keystone/common/wsgi.py:89
 msgid "Kerberos credentials required and not present"
 msgstr "L'identitification Kerberos est requise mais non présente"
 
-#: keystone/common/wsgi.py:92
+#: keystone/common/wsgi.py:93
 msgid "Kerberos credentials do not match those in bind"
 msgstr "L'identification Kerberos ne correspond pas à celle de l'attachement"
 
-#: keystone/common/wsgi.py:96
+#: keystone/common/wsgi.py:97
 msgid "Kerberos bind authentication successful"
 msgstr "Attachement Kerberos identifié correctement"
 
-#: keystone/common/wsgi.py:103
+#: keystone/common/wsgi.py:104
 #, python-format
 msgid "Couldn't verify unknown bind: {%(bind_type)s: %(identifier)s}"
 msgstr ""
@@ -115,7 +115,7 @@ msgstr ""
 "Réception de la notification suivante: service %(service)s, resource_type: "
 "%(resource_type)s, operation %(operation)s payload %(payload)s"
 
-#: keystone/openstack/common/eventlet_backdoor.py:147
+#: keystone/openstack/common/eventlet_backdoor.py:146
 #, python-format
 msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
 msgstr "Eventlet backdoor en écoute sur le port %(port)s for process %(pid)d"
@@ -125,54 +125,54 @@ msgstr "Eventlet backdoor en écoute sur le port %(port)s for process %(pid)d"
 msgid "Can not find policy directory: %s"
 msgstr ""
 
-#: keystone/openstack/common/service.py:174
+#: keystone/openstack/common/service.py:173
 #, python-format
 msgid "Caught %s, exiting"
 msgstr "%s interceptée, sortie"
 
-#: keystone/openstack/common/service.py:232
+#: keystone/openstack/common/service.py:231
 msgid "Parent process has died unexpectedly, exiting"
 msgstr "Processus parent arrêté de manière inattendue, sortie"
 
-#: keystone/openstack/common/service.py:263
+#: keystone/openstack/common/service.py:262
 #, python-format
 msgid "Child caught %s, exiting"
 msgstr "L'enfant a reçu %s, sortie"
 
-#: keystone/openstack/common/service.py:302
+#: keystone/openstack/common/service.py:301
 msgid "Forking too fast, sleeping"
 msgstr "Bifurcation trop rapide, pause"
 
-#: keystone/openstack/common/service.py:321
+#: keystone/openstack/common/service.py:320
 #, python-format
 msgid "Started child %d"
 msgstr "Enfant démarré %d"
 
-#: keystone/openstack/common/service.py:331
+#: keystone/openstack/common/service.py:330
 #, python-format
 msgid "Starting %d workers"
 msgstr "Démarrage des travailleurs %d"
 
-#: keystone/openstack/common/service.py:348
+#: keystone/openstack/common/service.py:347
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr "Enfant %(pid)d arrêté par le signal %(sig)d"
 
-#: keystone/openstack/common/service.py:352
+#: keystone/openstack/common/service.py:351
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr "Processus fils %(pid)s terminé avec le status %(code)d"
 
-#: keystone/openstack/common/service.py:391
+#: keystone/openstack/common/service.py:390
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr "%s interceptée, arrêt de l'enfant"
 
-#: keystone/openstack/common/service.py:400
-msgid "Wait called after thread killed.  Cleaning up."
-msgstr "Pause demandée après suppression de thread. Nettoyage."
+#: keystone/openstack/common/service.py:399
+msgid "Wait called after thread killed. Cleaning up."
+msgstr ""
 
-#: keystone/openstack/common/service.py:416
+#: keystone/openstack/common/service.py:415
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "En attente %d enfants pour sortie"
diff --git a/keystone/locale/fr/LC_MESSAGES/keystone-log-warning.po b/keystone/locale/fr/LC_MESSAGES/keystone-log-warning.po
index 17f197433c..0ee2bd6ec0 100644
--- a/keystone/locale/fr/LC_MESSAGES/keystone-log-warning.po
+++ b/keystone/locale/fr/LC_MESSAGES/keystone-log-warning.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-02-03 06:04+0000\n"
-"PO-Revision-Date: 2015-02-02 20:13+0000\n"
+"POT-Creation-Date: 2015-02-13 06:03+0000\n"
+"PO-Revision-Date: 2015-02-12 12:02+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/keystone/language/"
 "fr/)\n"
@@ -37,33 +37,33 @@ msgstr ""
 msgid "missing exception kwargs (programmer error)"
 msgstr ""
 
-#: keystone/assignment/controllers.py:77
+#: keystone/assignment/controllers.py:59
 #, python-format
 msgid "Authentication failed: %s"
 msgstr "L'authentification a échoué: %s"
 
-#: keystone/assignment/controllers.py:753
+#: keystone/assignment/controllers.py:567
 #, python-format
 msgid ""
 "Group %(group)s not found for role-assignment - %(target)s with Role: "
 "%(role)s"
 msgstr ""
 
-#: keystone/auth/controllers.py:440
+#: keystone/auth/controllers.py:449
 #, python-format
 msgid ""
 "User %(user_id)s doesn't have access to default project %(project_id)s. The "
 "token will be unscoped rather than scoped to the project."
 msgstr ""
 
-#: keystone/auth/controllers.py:448
+#: keystone/auth/controllers.py:457
 #, python-format
 msgid ""
 "User %(user_id)s's default project %(project_id)s is disabled. The token "
 "will be unscoped rather than scoped to the project."
 msgstr ""
 
-#: keystone/auth/controllers.py:457
+#: keystone/auth/controllers.py:466
 #, python-format
 msgid ""
 "User %(user_id)s's default project %(project_id)s not found. The token will "
@@ -79,15 +79,15 @@ msgid "RBAC: Invalid token"
 msgstr "RBAC : Jeton non valide"
 
 #: keystone/common/controller.py:104 keystone/common/controller.py:201
-#: keystone/common/controller.py:688
+#: keystone/common/controller.py:723
 msgid "RBAC: Bypassing authorization"
 msgstr "RBAC : Autorisation ignorée"
 
-#: keystone/common/controller.py:617 keystone/common/controller.py:652
+#: keystone/common/controller.py:652 keystone/common/controller.py:687
 msgid "Invalid token found while getting domain ID for list request"
 msgstr ""
 
-#: keystone/common/controller.py:625
+#: keystone/common/controller.py:660
 msgid "No domain information specified as part of list request"
 msgstr ""
 
@@ -96,12 +96,12 @@ msgstr ""
 msgid "Truncating user password to %d characters."
 msgstr ""
 
-#: keystone/common/wsgi.py:226
+#: keystone/common/wsgi.py:240
 #, python-format
 msgid "Authorization failed. %(exception)s from %(remote_addr)s"
 msgstr "Echec d'autorisation. %(exception)s depuis %(remote_addr)s"
 
-#: keystone/common/wsgi.py:346
+#: keystone/common/wsgi.py:360
 msgid "Invalid token in _get_trust_id_for_request"
 msgstr "Jeton invalide dans _get_trust_id_for_request"
 
@@ -223,12 +223,10 @@ msgstr ""
 
 #: keystone/openstack/common/loopingcall.py:87
 #, python-format
-msgid "task %(func_name)s run outlasted interval by %(delay).2f sec"
+msgid "task %(func_name)r run outlasted interval by %(delay).2f sec"
 msgstr ""
-"L'exécution de la tâche %(func_name)s a dépassé intervalle de %(delay).2f "
-"secondes "
 
-#: keystone/openstack/common/service.py:356
+#: keystone/openstack/common/service.py:355
 #, python-format
 msgid "pid %d not in child list"
 msgstr "PID %d absent de la liste d'enfants"
diff --git a/keystone/locale/it/LC_MESSAGES/keystone-log-info.po b/keystone/locale/it/LC_MESSAGES/keystone-log-info.po
index 4f23c029b8..042de53fb0 100644
--- a/keystone/locale/it/LC_MESSAGES/keystone-log-info.po
+++ b/keystone/locale/it/LC_MESSAGES/keystone-log-info.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-02-07 06:03+0000\n"
-"PO-Revision-Date: 2015-02-06 22:14+0000\n"
+"POT-Creation-Date: 2015-02-13 06:03+0000\n"
+"PO-Revision-Date: 2015-02-12 12:02+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/keystone/"
 "language/it/)\n"
@@ -45,28 +45,28 @@ msgstr ""
 msgid "Running command - %s"
 msgstr ""
 
-#: keystone/common/wsgi.py:77
+#: keystone/common/wsgi.py:78
 msgid "No bind information present in token"
 msgstr ""
 
-#: keystone/common/wsgi.py:81
+#: keystone/common/wsgi.py:82
 #, python-format
 msgid "Named bind mode %s not in bind information"
 msgstr ""
 
-#: keystone/common/wsgi.py:88
+#: keystone/common/wsgi.py:89
 msgid "Kerberos credentials required and not present"
 msgstr ""
 
-#: keystone/common/wsgi.py:92
+#: keystone/common/wsgi.py:93
 msgid "Kerberos credentials do not match those in bind"
 msgstr ""
 
-#: keystone/common/wsgi.py:96
+#: keystone/common/wsgi.py:97
 msgid "Kerberos bind authentication successful"
 msgstr ""
 
-#: keystone/common/wsgi.py:103
+#: keystone/common/wsgi.py:104
 #, python-format
 msgid "Couldn't verify unknown bind: {%(bind_type)s: %(identifier)s}"
 msgstr ""
@@ -103,7 +103,7 @@ msgid ""
 "%(resource_type)s, operation %(operation)s payload %(payload)s"
 msgstr ""
 
-#: keystone/openstack/common/eventlet_backdoor.py:147
+#: keystone/openstack/common/eventlet_backdoor.py:146
 #, python-format
 msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
 msgstr "Ascolto di eventlet backdoor su %(port)s per il processo %(pid)d"
@@ -113,54 +113,54 @@ msgstr "Ascolto di eventlet backdoor su %(port)s per il processo %(pid)d"
 msgid "Can not find policy directory: %s"
 msgstr ""
 
-#: keystone/openstack/common/service.py:174
+#: keystone/openstack/common/service.py:173
 #, python-format
 msgid "Caught %s, exiting"
 msgstr "Rilevato %s, esistente"
 
-#: keystone/openstack/common/service.py:232
+#: keystone/openstack/common/service.py:231
 msgid "Parent process has died unexpectedly, exiting"
 msgstr "Il processo principale è stato interrotto inaspettatamente, uscire"
 
-#: keystone/openstack/common/service.py:263
+#: keystone/openstack/common/service.py:262
 #, python-format
 msgid "Child caught %s, exiting"
 msgstr "Cogliere Child %s, uscendo"
 
-#: keystone/openstack/common/service.py:302
+#: keystone/openstack/common/service.py:301
 msgid "Forking too fast, sleeping"
 msgstr "Sblocco troppo veloce, attendere"
 
-#: keystone/openstack/common/service.py:321
+#: keystone/openstack/common/service.py:320
 #, python-format
 msgid "Started child %d"
 msgstr "Child avviato %d"
 
-#: keystone/openstack/common/service.py:331
+#: keystone/openstack/common/service.py:330
 #, python-format
 msgid "Starting %d workers"
 msgstr "Avvio %d operatori"
 
-#: keystone/openstack/common/service.py:348
+#: keystone/openstack/common/service.py:347
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr "Child %(pid)d interrotto dal segnale %(sig)d"
 
-#: keystone/openstack/common/service.py:352
+#: keystone/openstack/common/service.py:351
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr "Child %(pid)s terminato con stato %(code)d"
 
-#: keystone/openstack/common/service.py:391
+#: keystone/openstack/common/service.py:390
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr "Intercettato %s, arresto in corso dei children"
 
-#: keystone/openstack/common/service.py:400
-msgid "Wait called after thread killed.  Cleaning up."
-msgstr "Attendere la chiamata dopo l'uccisione de filo. Bonifica."
+#: keystone/openstack/common/service.py:399
+msgid "Wait called after thread killed. Cleaning up."
+msgstr ""
 
-#: keystone/openstack/common/service.py:416
+#: keystone/openstack/common/service.py:415
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "In attesa %d degli elementi secondari per uscire"
diff --git a/keystone/locale/keystone-log-info.pot b/keystone/locale/keystone-log-info.pot
index 280a85e12a..f6ebc0ea54 100644
--- a/keystone/locale/keystone-log-info.pot
+++ b/keystone/locale/keystone-log-info.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: keystone 2015.1.dev5\n"
+"Project-Id-Version: keystone 2015.1.dev53\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-02-07 06:03+0000\n"
+"POT-Creation-Date: 2015-02-13 06:03+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -43,28 +43,28 @@ msgstr ""
 msgid "Running command - %s"
 msgstr ""
 
-#: keystone/common/wsgi.py:77
+#: keystone/common/wsgi.py:78
 msgid "No bind information present in token"
 msgstr ""
 
-#: keystone/common/wsgi.py:81
+#: keystone/common/wsgi.py:82
 #, python-format
 msgid "Named bind mode %s not in bind information"
 msgstr ""
 
-#: keystone/common/wsgi.py:88
+#: keystone/common/wsgi.py:89
 msgid "Kerberos credentials required and not present"
 msgstr ""
 
-#: keystone/common/wsgi.py:92
+#: keystone/common/wsgi.py:93
 msgid "Kerberos credentials do not match those in bind"
 msgstr ""
 
-#: keystone/common/wsgi.py:96
+#: keystone/common/wsgi.py:97
 msgid "Kerberos bind authentication successful"
 msgstr ""
 
-#: keystone/common/wsgi.py:103
+#: keystone/common/wsgi.py:104
 #, python-format
 msgid "Couldn't verify unknown bind: {%(bind_type)s: %(identifier)s}"
 msgstr ""
@@ -101,7 +101,7 @@ msgid ""
 "%(resource_type)s, operation %(operation)s payload %(payload)s"
 msgstr ""
 
-#: keystone/openstack/common/eventlet_backdoor.py:147
+#: keystone/openstack/common/eventlet_backdoor.py:146
 #, python-format
 msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
 msgstr ""
@@ -111,54 +111,54 @@ msgstr ""
 msgid "Can not find policy directory: %s"
 msgstr ""
 
-#: keystone/openstack/common/service.py:174
+#: keystone/openstack/common/service.py:173
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: keystone/openstack/common/service.py:232
+#: keystone/openstack/common/service.py:231
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: keystone/openstack/common/service.py:263
+#: keystone/openstack/common/service.py:262
 #, python-format
 msgid "Child caught %s, exiting"
 msgstr ""
 
-#: keystone/openstack/common/service.py:302
+#: keystone/openstack/common/service.py:301
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: keystone/openstack/common/service.py:321
+#: keystone/openstack/common/service.py:320
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: keystone/openstack/common/service.py:331
+#: keystone/openstack/common/service.py:330
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: keystone/openstack/common/service.py:348
+#: keystone/openstack/common/service.py:347
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: keystone/openstack/common/service.py:352
+#: keystone/openstack/common/service.py:351
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: keystone/openstack/common/service.py:391
+#: keystone/openstack/common/service.py:390
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: keystone/openstack/common/service.py:400
-msgid "Wait called after thread killed.  Cleaning up."
+#: keystone/openstack/common/service.py:399
+msgid "Wait called after thread killed. Cleaning up."
 msgstr ""
 
-#: keystone/openstack/common/service.py:416
+#: keystone/openstack/common/service.py:415
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
diff --git a/keystone/locale/keystone-log-warning.pot b/keystone/locale/keystone-log-warning.pot
index aebb7bbcc9..445947e493 100644
--- a/keystone/locale/keystone-log-warning.pot
+++ b/keystone/locale/keystone-log-warning.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: keystone 2015.1.dev183\n"
+"Project-Id-Version: keystone 2015.1.dev53\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-02-03 06:04+0000\n"
+"POT-Creation-Date: 2015-02-13 06:03+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,33 +29,33 @@ msgstr ""
 msgid "missing exception kwargs (programmer error)"
 msgstr ""
 
-#: keystone/assignment/controllers.py:77
+#: keystone/assignment/controllers.py:59
 #, python-format
 msgid "Authentication failed: %s"
 msgstr ""
 
-#: keystone/assignment/controllers.py:753
+#: keystone/assignment/controllers.py:567
 #, python-format
 msgid ""
 "Group %(group)s not found for role-assignment - %(target)s with Role: "
 "%(role)s"
 msgstr ""
 
-#: keystone/auth/controllers.py:440
+#: keystone/auth/controllers.py:449
 #, python-format
 msgid ""
 "User %(user_id)s doesn't have access to default project %(project_id)s. "
 "The token will be unscoped rather than scoped to the project."
 msgstr ""
 
-#: keystone/auth/controllers.py:448
+#: keystone/auth/controllers.py:457
 #, python-format
 msgid ""
 "User %(user_id)s's default project %(project_id)s is disabled. The token "
 "will be unscoped rather than scoped to the project."
 msgstr ""
 
-#: keystone/auth/controllers.py:457
+#: keystone/auth/controllers.py:466
 #, python-format
 msgid ""
 "User %(user_id)s's default project %(project_id)s not found. The token "
@@ -71,15 +71,15 @@ msgid "RBAC: Invalid token"
 msgstr ""
 
 #: keystone/common/controller.py:104 keystone/common/controller.py:201
-#: keystone/common/controller.py:688
+#: keystone/common/controller.py:723
 msgid "RBAC: Bypassing authorization"
 msgstr ""
 
-#: keystone/common/controller.py:617 keystone/common/controller.py:652
+#: keystone/common/controller.py:652 keystone/common/controller.py:687
 msgid "Invalid token found while getting domain ID for list request"
 msgstr ""
 
-#: keystone/common/controller.py:625
+#: keystone/common/controller.py:660
 msgid "No domain information specified as part of list request"
 msgstr ""
 
@@ -88,12 +88,12 @@ msgstr ""
 msgid "Truncating user password to %d characters."
 msgstr ""
 
-#: keystone/common/wsgi.py:226
+#: keystone/common/wsgi.py:240
 #, python-format
 msgid "Authorization failed. %(exception)s from %(remote_addr)s"
 msgstr ""
 
-#: keystone/common/wsgi.py:346
+#: keystone/common/wsgi.py:360
 msgid "Invalid token in _get_trust_id_for_request"
 msgstr ""
 
@@ -207,10 +207,10 @@ msgstr ""
 
 #: keystone/openstack/common/loopingcall.py:87
 #, python-format
-msgid "task %(func_name)s run outlasted interval by %(delay).2f sec"
+msgid "task %(func_name)r run outlasted interval by %(delay).2f sec"
 msgstr ""
 
-#: keystone/openstack/common/service.py:356
+#: keystone/openstack/common/service.py:355
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
diff --git a/keystone/locale/vi_VN/LC_MESSAGES/keystone-log-info.po b/keystone/locale/vi_VN/LC_MESSAGES/keystone-log-info.po
index 4bd11bfc8a..3c63fa8c34 100644
--- a/keystone/locale/vi_VN/LC_MESSAGES/keystone-log-info.po
+++ b/keystone/locale/vi_VN/LC_MESSAGES/keystone-log-info.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-02-07 06:03+0000\n"
-"PO-Revision-Date: 2015-02-06 22:14+0000\n"
+"POT-Creation-Date: 2015-02-13 06:03+0000\n"
+"PO-Revision-Date: 2015-02-12 12:02+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/"
 "keystone/language/vi_VN/)\n"
@@ -45,28 +45,28 @@ msgstr ""
 msgid "Running command - %s"
 msgstr ""
 
-#: keystone/common/wsgi.py:77
+#: keystone/common/wsgi.py:78
 msgid "No bind information present in token"
 msgstr ""
 
-#: keystone/common/wsgi.py:81
+#: keystone/common/wsgi.py:82
 #, python-format
 msgid "Named bind mode %s not in bind information"
 msgstr ""
 
-#: keystone/common/wsgi.py:88
+#: keystone/common/wsgi.py:89
 msgid "Kerberos credentials required and not present"
 msgstr ""
 
-#: keystone/common/wsgi.py:92
+#: keystone/common/wsgi.py:93
 msgid "Kerberos credentials do not match those in bind"
 msgstr ""
 
-#: keystone/common/wsgi.py:96
+#: keystone/common/wsgi.py:97
 msgid "Kerberos bind authentication successful"
 msgstr ""
 
-#: keystone/common/wsgi.py:103
+#: keystone/common/wsgi.py:104
 #, python-format
 msgid "Couldn't verify unknown bind: {%(bind_type)s: %(identifier)s}"
 msgstr ""
@@ -103,7 +103,7 @@ msgid ""
 "%(resource_type)s, operation %(operation)s payload %(payload)s"
 msgstr ""
 
-#: keystone/openstack/common/eventlet_backdoor.py:147
+#: keystone/openstack/common/eventlet_backdoor.py:146
 #, python-format
 msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
 msgstr "Eventlet backdoor lắng nghe trên %(port)s đối với tiến trình %(pid)d"
@@ -113,54 +113,54 @@ msgstr "Eventlet backdoor lắng nghe trên %(port)s đối với tiến trình
 msgid "Can not find policy directory: %s"
 msgstr ""
 
-#: keystone/openstack/common/service.py:174
+#: keystone/openstack/common/service.py:173
 #, python-format
 msgid "Caught %s, exiting"
 msgstr "Bắt %s, thoát"
 
-#: keystone/openstack/common/service.py:232
+#: keystone/openstack/common/service.py:231
 msgid "Parent process has died unexpectedly, exiting"
 msgstr "Tiến trình cha bị chết đột ngột, thoát"
 
-#: keystone/openstack/common/service.py:263
+#: keystone/openstack/common/service.py:262
 #, python-format
 msgid "Child caught %s, exiting"
 msgstr "Tiến trình con bắt %s, thoát"
 
-#: keystone/openstack/common/service.py:302
+#: keystone/openstack/common/service.py:301
 msgid "Forking too fast, sleeping"
 msgstr "Tạo tiến trình con quá nhanh, nghỉ"
 
-#: keystone/openstack/common/service.py:321
+#: keystone/openstack/common/service.py:320
 #, python-format
 msgid "Started child %d"
 msgstr "Tiến trình con đã được khởi động %d "
 
-#: keystone/openstack/common/service.py:331
+#: keystone/openstack/common/service.py:330
 #, python-format
 msgid "Starting %d workers"
 msgstr "Khởi động %d động cơ"
 
-#: keystone/openstack/common/service.py:348
+#: keystone/openstack/common/service.py:347
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr "Tiến trình con %(pid)d bị huỷ bởi tín hiệu %(sig)d"
 
-#: keystone/openstack/common/service.py:352
+#: keystone/openstack/common/service.py:351
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr "Tiến trình con %(pid)s đã thiaast với trạng thái %(code)d"
 
-#: keystone/openstack/common/service.py:391
+#: keystone/openstack/common/service.py:390
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr "Bắt %s, đang dừng tiến trình con"
 
-#: keystone/openstack/common/service.py:400
-msgid "Wait called after thread killed.  Cleaning up."
-msgstr "Chờ đợi được gọi sau khi luồng bị huỷ. Làm sạch."
+#: keystone/openstack/common/service.py:399
+msgid "Wait called after thread killed. Cleaning up."
+msgstr ""
 
-#: keystone/openstack/common/service.py:416
+#: keystone/openstack/common/service.py:415
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "Chờ đợi %d tiến trình con để thoát "
diff --git a/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-info.po b/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-info.po
index da286e0ad8..0e2eb4f33f 100644
--- a/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-info.po
+++ b/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-info.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-02-07 06:03+0000\n"
-"PO-Revision-Date: 2015-02-06 22:14+0000\n"
+"POT-Creation-Date: 2015-02-13 06:03+0000\n"
+"PO-Revision-Date: 2015-02-12 12:31+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/keystone/"
 "language/zh_CN/)\n"
@@ -48,28 +48,28 @@ msgstr ""
 msgid "Running command - %s"
 msgstr "正在运行命令 - %s"
 
-#: keystone/common/wsgi.py:77
+#: keystone/common/wsgi.py:78
 msgid "No bind information present in token"
 msgstr "令牌中暂无绑定信息"
 
-#: keystone/common/wsgi.py:81
+#: keystone/common/wsgi.py:82
 #, python-format
 msgid "Named bind mode %s not in bind information"
 msgstr "在绑定信息中没有命名绑定模式%s"
 
-#: keystone/common/wsgi.py:88
+#: keystone/common/wsgi.py:89
 msgid "Kerberos credentials required and not present"
 msgstr "没有所需的Kerberos凭证"
 
-#: keystone/common/wsgi.py:92
+#: keystone/common/wsgi.py:93
 msgid "Kerberos credentials do not match those in bind"
 msgstr "在绑定中没有匹配的Kerberos凭证"
 
-#: keystone/common/wsgi.py:96
+#: keystone/common/wsgi.py:97
 msgid "Kerberos bind authentication successful"
 msgstr "Kerberos绑定认证成功"
 
-#: keystone/common/wsgi.py:103
+#: keystone/common/wsgi.py:104
 #, python-format
 msgid "Couldn't verify unknown bind: {%(bind_type)s: %(identifier)s}"
 msgstr "不能验证未知绑定: {%(bind_type)s: %(identifier)s}"
@@ -107,7 +107,7 @@ msgid ""
 "%(resource_type)s, operation %(operation)s payload %(payload)s"
 msgstr ""
 
-#: keystone/openstack/common/eventlet_backdoor.py:147
+#: keystone/openstack/common/eventlet_backdoor.py:146
 #, python-format
 msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
 msgstr "携程为进程 %(pid)d 在后台监听 %(port)s "
@@ -117,54 +117,54 @@ msgstr "携程为进程 %(pid)d 在后台监听 %(port)s "
 msgid "Can not find policy directory: %s"
 msgstr "无法找到策略目录:%s"
 
-#: keystone/openstack/common/service.py:174
+#: keystone/openstack/common/service.py:173
 #, python-format
 msgid "Caught %s, exiting"
 msgstr "捕获到 %s，正在退出"
 
-#: keystone/openstack/common/service.py:232
+#: keystone/openstack/common/service.py:231
 msgid "Parent process has died unexpectedly, exiting"
 msgstr "父进程已意外终止，正在退出"
 
-#: keystone/openstack/common/service.py:263
+#: keystone/openstack/common/service.py:262
 #, python-format
 msgid "Child caught %s, exiting"
 msgstr "子代捕获 %s，正在退出"
 
-#: keystone/openstack/common/service.py:302
+#: keystone/openstack/common/service.py:301
 msgid "Forking too fast, sleeping"
 msgstr "派生速度太快，正在休眠"
 
-#: keystone/openstack/common/service.py:321
+#: keystone/openstack/common/service.py:320
 #, python-format
 msgid "Started child %d"
 msgstr "已启动子代 %d"
 
-#: keystone/openstack/common/service.py:331
+#: keystone/openstack/common/service.py:330
 #, python-format
 msgid "Starting %d workers"
 msgstr "正在启动 %d 工作程序"
 
-#: keystone/openstack/common/service.py:348
+#: keystone/openstack/common/service.py:347
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr "信号 %(sig)d 已终止子代 %(pid)d"
 
-#: keystone/openstack/common/service.py:352
+#: keystone/openstack/common/service.py:351
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr "子代 %(pid)s 已退出，状态为 %(code)d"
 
-#: keystone/openstack/common/service.py:391
+#: keystone/openstack/common/service.py:390
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr "捕获到 %s，正在停止子代"
 
-#: keystone/openstack/common/service.py:400
-msgid "Wait called after thread killed.  Cleaning up."
-msgstr "等待线程结束后被调用。正在清理中。"
+#: keystone/openstack/common/service.py:399
+msgid "Wait called after thread killed. Cleaning up."
+msgstr "线程结束，正在清理"
 
-#: keystone/openstack/common/service.py:416
+#: keystone/openstack/common/service.py:415
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "正在等待 %d 个子代退出"