diff --git a/neutron/locale/es/LC_MESSAGES/neutron-log-info.po b/neutron/locale/es/LC_MESSAGES/neutron-log-info.po
index 862493ba88c..db80f74801c 100644
--- a/neutron/locale/es/LC_MESSAGES/neutron-log-info.po
+++ b/neutron/locale/es/LC_MESSAGES/neutron-log-info.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-05-29 06:16+0000\n"
-"PO-Revision-Date: 2015-05-28 20:54+0000\n"
+"POT-Creation-Date: 2015-06-11 06:02+0000\n"
+"PO-Revision-Date: 2015-06-10 23:52+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/neutron/language/"
 "es/)\n"
@@ -265,6 +265,9 @@ msgstr ""
 "Se ha encontrado un error en validación para CIDR: %(new_cidr)s; se solapa "
 "con la subred %(subnet_id)s (CIDR: %(cidr)s)"
 
+msgid "Wait called after thread killed. Cleaning up."
+msgstr "Esperar llamado después de cortar la línea. Limpiando."
+
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "En espera de %d hijos para salir"
diff --git a/neutron/locale/neutron-log-error.pot b/neutron/locale/neutron-log-error.pot
index a5b1b8ea5a9..1214d575b1c 100644
--- a/neutron/locale/neutron-log-error.pot
+++ b/neutron/locale/neutron-log-error.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: neutron 2015.2.0.dev533\n"
+"Project-Id-Version: neutron 2015.2.0.dev464\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-06-02 06:15+0000\n"
+"POT-Creation-Date: 2015-06-11 06:02+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"
@@ -17,83 +17,76 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: neutron/manager.py:133
+#: neutron/manager.py:134
 msgid "Error, plugin is not set"
 msgstr ""
 
-#: neutron/manager.py:144
-#, python-format
-msgid "Error loading plugin by name, %s"
-msgstr ""
-
 #: neutron/manager.py:145
 #, python-format
+msgid "Error loading plugin by name, %s"
+msgstr ""
+
+#: neutron/manager.py:146
+#, python-format
 msgid "Error loading plugin by class, %s"
 msgstr ""
 
-#: neutron/policy.py:123
-#, python-format
-msgid ""
-"Backward compatibility unavailable for deprecated policy %s. The policy "
-"will not be enforced"
-msgstr ""
-
-#: neutron/policy.py:311
+#: neutron/policy.py:266
 #, python-format
 msgid "Policy check error while calling %s!"
 msgstr ""
 
-#: neutron/service.py:107 neutron/service.py:165
+#: neutron/service.py:106 neutron/service.py:167
 msgid "Unrecoverable error: please check log for details."
 msgstr ""
 
-#: neutron/service.py:148
+#: neutron/service.py:146
 #, python-format
 msgid "'rpc_workers = %d' ignored because start_rpc_listeners is not implemented."
 msgstr ""
 
-#: neutron/service.py:172
+#: neutron/service.py:174
 msgid "No known API applications configured."
 msgstr ""
 
-#: neutron/service.py:279
+#: neutron/service.py:281
 msgid "Exception occurs when timer stops"
 msgstr ""
 
-#: neutron/service.py:288
+#: neutron/service.py:290
 msgid "Exception occurs when waiting for timer"
 msgstr ""
 
-#: neutron/wsgi.py:152
+#: neutron/wsgi.py:159
 #, python-format
 msgid "Unable to listen on %(host)s:%(port)s"
 msgstr ""
 
-#: neutron/wsgi.py:788
+#: neutron/wsgi.py:799
 #, python-format
 msgid "InvalidContentType: %s"
 msgstr ""
 
-#: neutron/wsgi.py:792
+#: neutron/wsgi.py:803
 #, python-format
 msgid "MalformedRequestBody: %s"
 msgstr ""
 
-#: neutron/wsgi.py:801
+#: neutron/wsgi.py:812
 msgid "Internal error"
 msgstr ""
 
-#: neutron/agent/common/ovs_lib.py:218 neutron/agent/common/ovs_lib.py:313
+#: neutron/agent/common/ovs_lib.py:219 neutron/agent/common/ovs_lib.py:314
 #, python-format
 msgid "Unable to execute %(cmd)s. Exception: %(exception)s"
 msgstr ""
 
-#: neutron/agent/common/ovs_lib.py:239
+#: neutron/agent/common/ovs_lib.py:240
 #, python-format
 msgid "Timed out retrieving ofport on port %(pname)s. Exception: %(exception)s"
 msgstr ""
 
-#: neutron/agent/common/ovs_lib.py:532
+#: neutron/agent/common/ovs_lib.py:533
 #, python-format
 msgid "OVS flows could not be applied on bridge %s"
 msgstr ""
@@ -117,61 +110,61 @@ msgstr ""
 msgid "Network %s info call failed."
 msgstr ""
 
-#: neutron/agent/dhcp/agent.py:582 neutron/agent/l3/agent.py:616
+#: neutron/agent/dhcp/agent.py:573 neutron/agent/l3/agent.py:627
 #: neutron/agent/metadata/agent.py:311
 #: neutron/plugins/hyperv/agent/l2_agent.py:94
-#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:108
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:787
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:295
+#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:109
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:812
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:300
 #: neutron/plugins/sriovnicagent/sriov_nic_agent.py:129
 #: neutron/services/metering/agents/metering_agent.py:283
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/l3/agent.py:172 neutron/tests/unit/agent/l3/test_agent.py:2150
+#: neutron/agent/l3/agent.py:173 neutron/tests/unit/agent/l3/test_agent.py:2193
 #, python-format
 msgid "Error importing interface driver '%s'"
 msgstr ""
 
-#: neutron/agent/l3/agent.py:234 neutron/agent/linux/dhcp.py:875
+#: neutron/agent/l3/agent.py:235 neutron/agent/linux/dhcp.py:879
 msgid "An interface driver must be specified"
 msgstr ""
 
-#: neutron/agent/l3/agent.py:239
+#: neutron/agent/l3/agent.py:240
 msgid "Router id is required if not using namespaces."
 msgstr ""
 
-#: neutron/agent/l3/agent.py:246
+#: neutron/agent/l3/agent.py:247
 #, python-format
 msgid "%s used in config as ipv6_gateway is not a valid IPv6 link-local address."
 msgstr ""
 
-#: neutron/agent/l3/agent.py:328
+#: neutron/agent/l3/agent.py:329
 #, python-format
 msgid "Error while deleting router %s"
 msgstr ""
 
-#: neutron/agent/l3/agent.py:392
+#: neutron/agent/l3/agent.py:398
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3/agent.py:446
+#: neutron/agent/l3/agent.py:452
 #, python-format
 msgid "Failed to fetch router information for '%s'"
 msgstr ""
 
-#: neutron/agent/l3/agent.py:469
+#: neutron/agent/l3/agent.py:475
 #, python-format
 msgid "Removing incompatible router '%s'"
 msgstr ""
 
-#: neutron/agent/l3/agent.py:473
+#: neutron/agent/l3/agent.py:479
 #, python-format
 msgid "Failed to process compatible router '%s'"
 msgstr ""
 
-#: neutron/agent/l3/agent.py:525
+#: neutron/agent/l3/agent.py:531
 msgid "Failed synchronizing routers due to RPC error"
 msgstr ""
 
@@ -248,7 +241,7 @@ msgstr ""
 msgid "Pidfile %s already exist. Daemon already running?"
 msgstr ""
 
-#: neutron/agent/linux/dhcp.py:881
+#: neutron/agent/linux/dhcp.py:885
 #, python-format
 msgid "Error importing interface driver '%(driver)s': %(inner)s"
 msgstr ""
@@ -276,36 +269,36 @@ msgid ""
 "identified by uuid %(uuid)s"
 msgstr ""
 
-#: neutron/agent/linux/interface.py:158
-#, python-format
-msgid "Failed deleting ingress connection state of floatingip %s"
-msgstr ""
-
-#: neutron/agent/linux/interface.py:167
-#, python-format
-msgid "Failed deleting egress connection state of floatingip %s"
-msgstr ""
-
-#: neutron/agent/linux/interface.py:294 neutron/agent/linux/interface.py:331
-#: neutron/agent/linux/interface.py:389 neutron/agent/linux/interface.py:425
+#: neutron/agent/linux/interface.py:262 neutron/agent/linux/interface.py:299
+#: neutron/agent/linux/interface.py:357 neutron/agent/linux/interface.py:393
 #, python-format
 msgid "Failed unplugging interface '%s'"
 msgstr ""
 
-#: neutron/agent/linux/ip_lib.py:407
+#: neutron/agent/linux/ip_lib.py:237
+#, python-format
+msgid "Failed deleting ingress connection state of floatingip %s"
+msgstr ""
+
+#: neutron/agent/linux/ip_lib.py:246
+#, python-format
+msgid "Failed deleting egress connection state of floatingip %s"
+msgstr ""
+
+#: neutron/agent/linux/ip_lib.py:442
 msgid "Address not present on interface"
 msgstr ""
 
-#: neutron/agent/linux/ip_lib.py:412
+#: neutron/agent/linux/ip_lib.py:447
 msgid "Duplicate adddress detected"
 msgstr ""
 
-#: neutron/agent/linux/ip_lib.py:413
+#: neutron/agent/linux/ip_lib.py:448
 #, python-format
 msgid "Exceeded %s second limit waiting for address to leave the tentative state."
 msgstr ""
 
-#: neutron/agent/linux/ip_lib.py:718
+#: neutron/agent/linux/ip_lib.py:753
 #, python-format
 msgid "Failed sending gratuitous ARP to %(addr)s on %(iface)s in namespace %(ns)s"
 msgstr ""
@@ -322,11 +315,11 @@ msgstr ""
 msgid "Unable to parse route \"%s\""
 msgstr ""
 
-#: neutron/agent/linux/iptables_manager.py:403
+#: neutron/agent/linux/iptables_manager.py:404
 msgid "Failure applying iptables rules"
 msgstr ""
 
-#: neutron/agent/linux/iptables_manager.py:481
+#: neutron/agent/linux/iptables_manager.py:482
 #, python-format
 msgid ""
 "IPTablesManager.apply failed to apply the following set of iptables "
@@ -339,7 +332,7 @@ msgstr ""
 msgid "Error received from ovsdb monitor: %s"
 msgstr ""
 
-#: neutron/agent/linux/utils.py:220
+#: neutron/agent/linux/utils.py:227
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
@@ -354,12 +347,12 @@ msgstr ""
 msgid "OVSDB Error: %s"
 msgstr ""
 
-#: neutron/agent/ovsdb/impl_vsctl.py:68
+#: neutron/agent/ovsdb/impl_vsctl.py:67
 #, python-format
 msgid "Unable to execute %(cmd)s."
 msgstr ""
 
-#: neutron/agent/ovsdb/impl_vsctl.py:127
+#: neutron/agent/ovsdb/impl_vsctl.py:126
 #, python-format
 msgid "Could not parse: %s"
 msgstr ""
@@ -419,13 +412,13 @@ msgid ""
 "message %s"
 msgstr ""
 
-#: neutron/api/rpc/handlers/l3_rpc.py:73
+#: neutron/api/rpc/handlers/l3_rpc.py:74
 msgid ""
 "No plugin for L3 routing registered! Will reply to l3 agent with empty "
 "router dictionary."
 msgstr ""
 
-#: neutron/api/v2/base.py:374
+#: neutron/api/v2/base.py:375
 #, python-format
 msgid "Unable to undo add for %(resource)s %(id)s"
 msgstr ""
@@ -540,19 +533,23 @@ msgstr ""
 msgid "Failed to schedule network %s"
 msgstr ""
 
-#: neutron/db/agentschedulers_db.py:299
+#: neutron/db/agentschedulers_db.py:301
 #, python-format
 msgid ""
 "Unexpected exception occurred while removing network %(net)s from agent "
 "%(agent)s"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:953 neutron/plugins/ml2/plugin.py:570
+#: neutron/db/agentschedulers_db.py:312
+msgid "Exception encountered during network rescheduling"
+msgstr ""
+
+#: neutron/db/db_base_plugin_v2.py:359 neutron/plugins/ml2/plugin.py:566
 #, python-format
 msgid "An exception occurred while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1821
+#: neutron/db/db_base_plugin_v2.py:1141
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
@@ -567,16 +564,16 @@ msgstr ""
 msgid "Could not retrieve gateway port for subnet %s"
 msgstr ""
 
-#: neutron/db/l3_agentschedulers_db.py:117
+#: neutron/db/l3_agentschedulers_db.py:118
 #, python-format
 msgid "Failed to reschedule router %s"
 msgstr ""
 
-#: neutron/db/l3_agentschedulers_db.py:122
+#: neutron/db/l3_agentschedulers_db.py:123
 msgid "Exception encountered during router rescheduling."
 msgstr ""
 
-#: neutron/db/l3_db.py:541
+#: neutron/db/l3_db.py:542
 msgid "Cannot have multiple IPv4 subnets on router port"
 msgstr ""
 
@@ -718,210 +715,210 @@ msgstr ""
 msgid "Delete floatingip failed in SDN-VE: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:195
+#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:196
 #, python-format
 msgid ""
 "Interface %(interface)s for physical network %(physical_network)s does "
 "not exist. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:255
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1658
+#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:256
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1688
 #, python-format
 msgid "%s Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:184
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:185
 #, python-format
 msgid "Failed creating vxlan interface for %(segmentation_id)s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:339
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:340
 #, python-format
 msgid "Unable to add %(interface)s to %(bridge_name)s! Exception: %(e)s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:352
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:353
 #, python-format
 msgid "Unable to add vxlan interface for network %s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:359
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:360
 #, python-format
 msgid "No mapping for physical network %s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:368
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:369
 #, python-format
 msgid "Unknown network_type %(network_type)s for network %(network_id)s."
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:461
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:462
 #, python-format
 msgid "Cannot delete bridge %s, does not exist"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:540
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:541
 msgid "No valid Segmentation ID to perform UCAST test."
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:797
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:822
 msgid "Unable to obtain MAC address for unique ID. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:994
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1019
 #: neutron/plugins/sriovnicagent/sriov_nic_agent.py:270
 #, python-format
 msgid "Error in agent loop. Devices info: %s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1017
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1047
 #: neutron/plugins/ml2/drivers/mlnx/agent/eswitch_neutron_agent.py:40
 #, python-format
 msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/ml2/db.py:241 neutron/plugins/ml2/db.py:325
+#: neutron/plugins/ml2/db.py:242 neutron/plugins/ml2/db.py:326
 #: neutron/plugins/ml2/plugin.py:1341
 #, python-format
 msgid "Multiple ports have port_id starting with %s"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:59
+#: neutron/plugins/ml2/managers.py:60
 #, python-format
 msgid ""
 "Type driver '%(new_driver)s' ignored because type driver '%(old_driver)s'"
 " is already registered for type '%(type)s'"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:75
+#: neutron/plugins/ml2/managers.py:76
 #, python-format
 msgid "No type driver for tenant network_type: %s. Service terminated!"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:82
+#: neutron/plugins/ml2/managers.py:83
 #, python-format
 msgid "No type driver for external network_type: %s. Service terminated!"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:151
+#: neutron/plugins/ml2/managers.py:152
 #, python-format
 msgid "Network %s has no segments"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:250 neutron/plugins/ml2/managers.py:277
+#: neutron/plugins/ml2/managers.py:251 neutron/plugins/ml2/managers.py:278
 #, python-format
 msgid "Failed to release segment '%s' because network type is not supported."
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:352
+#: neutron/plugins/ml2/managers.py:353
 #, python-format
 msgid "Mechanism driver '%(name)s' failed in %(method)s"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:638 neutron/plugins/ml2/managers.py:700
+#: neutron/plugins/ml2/managers.py:639 neutron/plugins/ml2/managers.py:701
 #, python-format
 msgid "Failed to bind port %(port)s on host %(host)s"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:653
+#: neutron/plugins/ml2/managers.py:654
 #, python-format
 msgid ""
 "Exceeded maximum binding levels attempting to bind port %(port)s on host "
 "%(host)s"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:696
+#: neutron/plugins/ml2/managers.py:697
 #, python-format
 msgid "Mechanism driver %s failed in bind_port"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:767
+#: neutron/plugins/ml2/managers.py:768
 #, python-format
 msgid "Extension driver '%(name)s' failed in %(method)s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:288
+#: neutron/plugins/ml2/plugin.py:284
 #, python-format
 msgid "Failed to commit binding results for %(port)s after %(max)s tries"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:450
+#: neutron/plugins/ml2/plugin.py:446
 #, python-format
 msgid "Serialized vif_details DB value '%(value)s' for port %(port)s is invalid"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:461
+#: neutron/plugins/ml2/plugin.py:457
 #, python-format
 msgid "Serialized profile DB value '%(value)s' for port %(port)s is invalid"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:547
+#: neutron/plugins/ml2/plugin.py:543
 #, python-format
 msgid "Could not find %s to delete."
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:550
+#: neutron/plugins/ml2/plugin.py:546
 #, python-format
 msgid "Could not delete %(res)s %(id)s."
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:583
+#: neutron/plugins/ml2/plugin.py:579
 #, python-format
 msgid ""
 "mechanism_manager.create_%(res)s_postcommit failed for %(res)s: "
 "'%(failed_id)s'. Deleting %(res)ss %(resource_ids)s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:629
+#: neutron/plugins/ml2/plugin.py:625
 #, python-format
 msgid "mechanism_manager.create_network_postcommit failed, deleting network '%s'"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:699
+#: neutron/plugins/ml2/plugin.py:695
 #, python-format
 msgid "Exception auto-deleting port %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:712
+#: neutron/plugins/ml2/plugin.py:708
 #, python-format
 msgid "Exception auto-deleting subnet %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:794
+#: neutron/plugins/ml2/plugin.py:790
 msgid "mechanism_manager.delete_network_postcommit failed"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:815
+#: neutron/plugins/ml2/plugin.py:811
 #, python-format
 msgid "mechanism_manager.create_subnet_postcommit failed, deleting subnet '%s'"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:938
+#: neutron/plugins/ml2/plugin.py:934
 #, python-format
 msgid "Exception deleting fixed_ip from port %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:947
+#: neutron/plugins/ml2/plugin.py:943
 msgid "mechanism_manager.delete_subnet_postcommit failed"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1012
+#: neutron/plugins/ml2/plugin.py:1008
 #, python-format
 msgid "mechanism_manager.create_port_postcommit failed, deleting port '%s'"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1024
+#: neutron/plugins/ml2/plugin.py:1020
 #, python-format
 msgid "_bind_port_if_needed failed, deleting port '%s'"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1055
+#: neutron/plugins/ml2/plugin.py:1051
 #, python-format
 msgid "_bind_port_if_needed failed. Deleting all ports from create bulk '%s'"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1200
+#: neutron/plugins/ml2/plugin.py:1198
 #, python-format
 msgid "No Host supplied to bind DVR Port %s"
 msgstr ""
@@ -936,11 +933,11 @@ msgstr ""
 msgid "Binding info for DVR port %s not found"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_gre.py:81
+#: neutron/plugins/ml2/drivers/type_gre.py:82
 msgid "Failed to parse tunnel_id_ranges. Service terminated!"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_gre.py:92
+#: neutron/plugins/ml2/drivers/type_gre.py:93
 #, python-format
 msgid "Skipping unreasonable gre ID range %(tun_min)s:%(tun_max)s"
 msgstr ""
@@ -1098,110 +1095,110 @@ msgid ""
 "a different subnet %(orig_subnet)s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:384
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:404
 msgid "No tunnel_type specified, cannot create tunnels"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:387
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:410
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:407
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:430
 #, python-format
 msgid "tunnel_type %s not supported by agent"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:403
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:423
 msgid "No tunnel_ip specified, cannot delete tunnels"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:407
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:427
 msgid "No tunnel_type specified, cannot delete tunnels"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:553
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:573
 #, python-format
 msgid "No local VLAN available for net-id=%s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:584
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:604
 #, python-format
 msgid ""
 "Cannot provision %(network_type)s network for net-id=%(net_uuid)s - "
 "tunneling disabled"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:592
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:612
 #, python-format
 msgid ""
 "Cannot provision flat network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:602
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:622
 #, python-format
 msgid ""
 "Cannot provision VLAN network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:611
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:631
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:671
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:691
 #, python-format
 msgid ""
 "Cannot reclaim unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:868
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:889
 msgid ""
 "Failed to create OVS patch port. Cannot have tunneling enabled on this "
 "agent, since this version of OVS does not support tunnels or patch ports."
 " Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:927
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:948
 #, python-format
 msgid ""
 "Bridge %(bridge)s for physical network %(physical_network)s does not "
 "exist. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1121
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1142
 #, python-format
 msgid "Failed to set-up %(type)s tunnel port to %(ip)s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1310
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1331
 #, python-format
 msgid ""
 "process_network_ports - iteration:%d - failure while retrieving port "
 "details from server"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1346
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1367
 #, python-format
 msgid ""
 "process_ancillary_network_ports - iteration:%d - failure while retrieving"
 " port details from server"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1488
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1509
 msgid "Error while synchronizing tunnels"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1563
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1585
 msgid "Error while processing VIF ports"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1652
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1682
 msgid "Agent failed to create agent config map"
 msgstr ""
 
-#: neutron/plugins/sriovnicagent/eswitch_manager.py:48
+#: neutron/plugins/sriovnicagent/eswitch_manager.py:49
 #, python-format
 msgid "Failed to get devices for %s"
 msgstr ""
diff --git a/neutron/locale/neutron-log-info.pot b/neutron/locale/neutron-log-info.pot
index 056383ecbc4..215c34c4342 100644
--- a/neutron/locale/neutron-log-info.pot
+++ b/neutron/locale/neutron-log-info.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: neutron 2015.2.0.dev485\n"
+"Project-Id-Version: neutron 2015.2.0.dev464\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-05-29 06:16+0000\n"
+"POT-Creation-Date: 2015-06-11 06:02+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"
@@ -17,28 +17,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: neutron/manager.py:115
+#: neutron/manager.py:116
 #, python-format
 msgid "Loading core plugin: %s"
 msgstr ""
 
-#: neutron/manager.py:155
+#: neutron/manager.py:164
 #, python-format
 msgid "Service %s is supported by the core plugin"
 msgstr ""
 
-#: neutron/manager.py:173
+#: neutron/manager.py:182
 #, python-format
 msgid "Loading Plugin: %s"
 msgstr ""
 
-#: neutron/policy.py:114
-#, python-format
-msgid ""
-"Inserting policy:%(new_policy)s in place of deprecated "
-"policy:%(old_policy)s"
-msgstr ""
-
 #: neutron/quota.py:221
 msgid ""
 "ConfDriver is used as quota_driver because the loaded plugin does not "
@@ -50,27 +43,27 @@ msgstr ""
 msgid "Loaded quota_driver: %s."
 msgstr ""
 
-#: neutron/service.py:179
+#: neutron/service.py:181
 #, python-format
 msgid "Neutron service started, listening on %(host)s:%(port)s"
 msgstr ""
 
-#: neutron/wsgi.py:781
+#: neutron/wsgi.py:792
 #, python-format
 msgid "%(method)s %(url)s"
 msgstr ""
 
-#: neutron/wsgi.py:798
+#: neutron/wsgi.py:809
 #, python-format
 msgid "HTTP exception thrown: %s"
 msgstr ""
 
-#: neutron/wsgi.py:814
+#: neutron/wsgi.py:825
 #, python-format
 msgid "%(url)s returned with HTTP %(status)d"
 msgstr ""
 
-#: neutron/wsgi.py:817
+#: neutron/wsgi.py:828
 #, python-format
 msgid "%(url)s returned a fault: %(exception)s"
 msgstr ""
@@ -122,12 +115,12 @@ msgstr ""
 msgid "No ports here to refresh firewall"
 msgstr ""
 
-#: neutron/agent/common/ovs_lib.py:421
+#: neutron/agent/common/ovs_lib.py:423
 #, python-format
 msgid "Port %(port_id)s not present in bridge %(br_name)s"
 msgstr ""
 
-#: neutron/agent/dhcp/agent.py:93 neutron/agent/dhcp/agent.py:594
+#: neutron/agent/dhcp/agent.py:93 neutron/agent/dhcp/agent.py:585
 msgid "DHCP agent started"
 msgstr ""
 
@@ -139,13 +132,13 @@ msgstr ""
 msgid "Synchronizing state complete"
 msgstr ""
 
-#: neutron/agent/dhcp/agent.py:591 neutron/agent/l3/agent.py:619
+#: neutron/agent/dhcp/agent.py:582 neutron/agent/l3/agent.py:641
 #: neutron/services/metering/agents/metering_agent.py:286
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr ""
 
-#: neutron/agent/l3/agent.py:550
+#: neutron/agent/l3/agent.py:563 neutron/agent/l3/agent.py:631
 msgid "L3 agent started"
 msgstr ""
 
@@ -166,24 +159,24 @@ msgstr ""
 msgid "Process runs with uid/gid: %(uid)s/%(gid)s"
 msgstr ""
 
-#: neutron/agent/linux/dhcp.py:745
+#: neutron/agent/linux/dhcp.py:749
 #, python-format
 msgid ""
 "Cannot apply dhcp option %(opt)s because it's ip_version %(version)d is "
 "not in port's address IP versions"
 msgstr ""
 
-#: neutron/agent/linux/interface.py:196
+#: neutron/agent/linux/interface.py:164
 #, python-format
 msgid "Device %s already exists"
 msgstr ""
 
-#: neutron/agent/linux/iptables_firewall.py:114
+#: neutron/agent/linux/iptables_firewall.py:115
 #, python-format
 msgid "Attempted to update port filter which is not filtered %s"
 msgstr ""
 
-#: neutron/agent/linux/iptables_firewall.py:125
+#: neutron/agent/linux/iptables_firewall.py:126
 #, python-format
 msgid "Attempted to remove port filter which is not filtered %r"
 msgstr ""
@@ -197,7 +190,7 @@ msgstr ""
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: neutron/api/v2/base.py:93
+#: neutron/api/v2/base.py:94
 msgid "Allow sorting is enabled because native pagination requires native sorting"
 msgstr ""
 
@@ -221,23 +214,23 @@ msgid "OVS cleanup completed successfully"
 msgstr ""
 
 #: neutron/cmd/eventlet/plugins/hyperv_neutron_agent.py:43
-#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:261
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1025
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1570
+#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:262
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1057
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1594
 #: neutron/plugins/sriovnicagent/sriov_nic_agent.py:345
 msgid "Agent initialized successfully, now running... "
 msgstr ""
 
-#: neutron/common/config.py:204
+#: neutron/common/config.py:207
 msgid "Logging enabled!"
 msgstr ""
 
-#: neutron/common/config.py:205
+#: neutron/common/config.py:208
 #, python-format
 msgid "%(prog)s version %(version)s"
 msgstr ""
 
-#: neutron/common/config.py:224
+#: neutron/common/config.py:235
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
@@ -269,51 +262,51 @@ msgstr ""
 msgid "Adding network %(net)s to agent %(agent)s on host %(host)s"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:642
+#: neutron/db/db_base_plugin_v2.py:201
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:679
-#, python-format
-msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
-msgstr ""
-
-#: neutron/db/db_base_plugin_v2.py:686
-msgid "Specified IP addresses do not match the subnet IP version"
-msgstr ""
-
-#: neutron/db/db_base_plugin_v2.py:690
-#, python-format
-msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
-msgstr ""
-
-#: neutron/db/db_base_plugin_v2.py:695
-#, python-format
-msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
-msgstr ""
-
-#: neutron/db/db_base_plugin_v2.py:719
-#, python-format
-msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
-msgstr ""
-
-#: neutron/db/db_base_plugin_v2.py:1639 neutron/plugins/ml2/plugin.py:895
+#: neutron/db/db_base_plugin_v2.py:959 neutron/plugins/ml2/plugin.py:891
 #, python-format
 msgid ""
 "Found port (%(port_id)s, %(ip)s) having IP allocation on subnet "
 "%(subnet)s, cannot delete"
 msgstr ""
 
-#: neutron/db/l3_agentschedulers_db.py:78
+#: neutron/db/ipam_backend_mixin.py:103
+#, python-format
+msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
+msgstr ""
+
+#: neutron/db/ipam_backend_mixin.py:110
+msgid "Specified IP addresses do not match the subnet IP version"
+msgstr ""
+
+#: neutron/db/ipam_backend_mixin.py:114
+#, python-format
+msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
+msgstr ""
+
+#: neutron/db/ipam_backend_mixin.py:119
+#, python-format
+msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
+msgstr ""
+
+#: neutron/db/ipam_backend_mixin.py:143
+#, python-format
+msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
+msgstr ""
+
+#: neutron/db/l3_agentschedulers_db.py:79
 msgid ""
 "Skipping period L3 agent status check because automatic router "
 "rescheduling is disabled."
 msgstr ""
 
-#: neutron/db/l3_db.py:1160
+#: neutron/db/l3_db.py:1161
 #, python-format
 msgid "Skipping port %s as no IP is configure on it"
 msgstr ""
@@ -536,204 +529,208 @@ msgstr ""
 msgid "Set the controller to a new controller: %s"
 msgstr ""
 
-#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:189
+#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:190
 #, python-format
 msgid "Mapping physical network %(physical_network)s to interface %(interface)s"
 msgstr ""
 
-#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:220
+#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:221
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!"
 msgstr ""
 
-#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:234
+#: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:235
 #, python-format
 msgid "Controller IPs: %s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:801
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:796
+msgid "Stopping linuxbridge agent."
+msgstr ""
+
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:826
 #: neutron/plugins/oneconvergence/agent/nvsd_neutron_agent.py:89
 #: neutron/plugins/sriovnicagent/sriov_nic_agent.py:99
 #, python-format
 msgid "RPC agent_id: %s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:871
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1187
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:896
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1210
 #: neutron/plugins/sriovnicagent/sriov_nic_agent.py:209
 #, python-format
 msgid "Port %(device)s updated. Details: %(details)s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:904
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:929
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:911
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1234
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1251
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:936
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1257
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1274
 #, python-format
 msgid "Attachment %s removed"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:923
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1263
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:948
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1286
 #: neutron/plugins/sriovnicagent/sriov_nic_agent.py:235
 #, python-format
 msgid "Port %s updated."
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:976
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1001
 msgid "LinuxBridge Agent RPC Daemon Started!"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:986
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1454
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1011
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1477
 #: neutron/plugins/sriovnicagent/sriov_nic_agent.py:251
 msgid "Agent out of sync with plugin!"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1020
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1050
 #: neutron/plugins/ml2/drivers/mlnx/agent/eswitch_neutron_agent.py:43
 #, python-format
 msgid "Interface mappings: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/db.py:59
+#: neutron/plugins/ml2/db.py:60
 #, python-format
 msgid "Added segment %(id)s of type %(network_type)s for network %(network_id)s"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:45
+#: neutron/plugins/ml2/managers.py:46
 #, python-format
 msgid "Configured type driver names: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:50
+#: neutron/plugins/ml2/managers.py:51
 #, python-format
 msgid "Loaded type driver names: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:67
+#: neutron/plugins/ml2/managers.py:68
 #, python-format
 msgid "Registered types: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:78
+#: neutron/plugins/ml2/managers.py:79
 #, python-format
 msgid "Tenant network_types: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:168
+#: neutron/plugins/ml2/managers.py:169
 #, python-format
 msgid "Initializing driver for type '%s'"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:293
+#: neutron/plugins/ml2/managers.py:294
 #, python-format
 msgid "Configured mechanism driver names: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:299
+#: neutron/plugins/ml2/managers.py:300
 #, python-format
 msgid "Loaded mechanism driver names: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:311
+#: neutron/plugins/ml2/managers.py:312
 #, python-format
 msgid "Registered mechanism drivers: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:316
+#: neutron/plugins/ml2/managers.py:317
 #, python-format
 msgid "Initializing mechanism driver '%s'"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:725
+#: neutron/plugins/ml2/managers.py:726
 #, python-format
 msgid "Configured extension driver names: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:731
+#: neutron/plugins/ml2/managers.py:732
 #, python-format
 msgid "Loaded extension driver names: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:742
+#: neutron/plugins/ml2/managers.py:743
 #, python-format
 msgid "Registered extension drivers: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:748
+#: neutron/plugins/ml2/managers.py:749
 #, python-format
 msgid "Initializing extension driver '%s'"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:756
+#: neutron/plugins/ml2/managers.py:757
 #, python-format
 msgid "Got %(alias)s extension from driver '%(drv)s'"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:805
+#: neutron/plugins/ml2/managers.py:806
 #, python-format
 msgid "Extended network dict for driver '%(drv)s'"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:812
+#: neutron/plugins/ml2/managers.py:813
 #, python-format
 msgid "Extended subnet dict for driver '%(drv)s'"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:819
+#: neutron/plugins/ml2/managers.py:820
 #, python-format
 msgid "Extended port dict for driver '%(drv)s'"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:143
+#: neutron/plugins/ml2/plugin.py:139
 msgid "Modular L2 Plugin initialization complete"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:294
+#: neutron/plugins/ml2/plugin.py:290
 #, python-format
 msgid "Attempt %(count)s to bind port %(port)s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:696
+#: neutron/plugins/ml2/plugin.py:692
 #, python-format
 msgid "Port %s was deleted concurrently"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:708
+#: neutron/plugins/ml2/plugin.py:704
 #, python-format
 msgid "Subnet %s was deleted concurrently"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1366
+#: neutron/plugins/ml2/plugin.py:1367
 #, python-format
 msgid ""
 "Binding info for port %s was not found, it might have been deleted "
 "already."
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_flat.py:72
+#: neutron/plugins/ml2/drivers/type_flat.py:73
 msgid "Arbitrary flat physical_network names allowed"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_flat.py:78
+#: neutron/plugins/ml2/drivers/type_flat.py:79
 #, python-format
 msgid "Allowable flat physical_network names: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_flat.py:85
+#: neutron/plugins/ml2/drivers/type_flat.py:86
 msgid "ML2 FlatTypeDriver initialization complete"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_local.py:37
+#: neutron/plugins/ml2/drivers/type_local.py:38
 msgid "ML2 LocalTypeDriver initialization complete"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_tunnel.py:116
+#: neutron/plugins/ml2/drivers/type_tunnel.py:113
 #, python-format
 msgid "%(type)s ID ranges: %(range)s"
 msgstr ""
@@ -816,64 +813,72 @@ msgstr ""
 msgid "L2 Agent operating in DVR Mode with MAC %s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:560
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:582
 #, python-format
 msgid "Assigning %(vlan_id)s as local vlan for net-id=%(net_uuid)s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:624
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:646
 #, python-format
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:743
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:765
 #, python-format
 msgid "Configuration for device %s completed."
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:750
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:772
 #, python-format
 msgid ""
 "Skipping ARP spoofing rules for port '%s' because it has port security "
 "disabled"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:778
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:800
 #, python-format
 msgid "port_unbound(): net_uuid %s not in local_vlan_map"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:843
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:866
 #, python-format
 msgid "Adding %s to list of bridges."
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:919
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:942
 #, python-format
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1067
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1090
 #, python-format
 msgid "Port '%(port_name)s' has lost its vlan tag '%(vlan_tag)d'!"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1181
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1204
 #, python-format
 msgid ""
 "Port %s was not found on the integration bridge and will therefore not be"
 " processed"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1222
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1245
 #, python-format
 msgid "Ancillary Port %s added"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1482
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1505
 msgid "Agent tunnel out of sync with plugin!"
 msgstr ""
 
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1604
+msgid "Agent caught SIGTERM, quitting daemon loop."
+msgstr ""
+
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1610
+msgid "Agent caught SIGHUP, resetting."
+msgstr ""
+
 #: neutron/plugins/sriovnicagent/sriov_nic_agent.py:191
 #, python-format
 msgid "No device with MAC %s defined on agent."
diff --git a/neutron/locale/neutron-log-warning.pot b/neutron/locale/neutron-log-warning.pot
index 0d10ecfd440..6fc2e6acec3 100644
--- a/neutron/locale/neutron-log-warning.pot
+++ b/neutron/locale/neutron-log-warning.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: neutron 2015.2.0.dev422\n"
+"Project-Id-Version: neutron 2015.2.0.dev464\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-05-25 06:15+0000\n"
+"POT-Creation-Date: 2015-06-11 06:02+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"
@@ -17,14 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: neutron/policy.py:102
-#, python-format
-msgid ""
-"Found deprecated policy rule:%s. Please consider upgrading your policy "
-"configuration file"
-msgstr ""
-
-#: neutron/policy.py:160
+#: neutron/policy.py:115
 #, python-format
 msgid "Unable to find data type descriptor for attribute %s"
 msgstr ""
@@ -66,17 +59,17 @@ msgid ""
 "falling back to old security_group_rules_for_devices which scales worse."
 msgstr ""
 
-#: neutron/agent/common/ovs_lib.py:361
+#: neutron/agent/common/ovs_lib.py:368
 #, python-format
 msgid "Found not yet ready openvswitch port: %s"
 msgstr ""
 
-#: neutron/agent/common/ovs_lib.py:364
+#: neutron/agent/common/ovs_lib.py:371
 #, python-format
 msgid "Found failed openvswitch port: %s"
 msgstr ""
 
-#: neutron/agent/common/ovs_lib.py:410
+#: neutron/agent/common/ovs_lib.py:417
 #, python-format
 msgid "ofport: %(ofport)s for VIF: %(vif)s is not a positive integer"
 msgstr ""
@@ -108,7 +101,7 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp/agent.py:576 neutron/agent/l3/agent.py:609
+#: neutron/agent/dhcp/agent.py:567 neutron/agent/l3/agent.py:622
 #: neutron/agent/metadata/agent.py:306
 #: neutron/services/metering/agents/metering_agent.py:278
 msgid ""
@@ -116,7 +109,7 @@ msgid ""
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/l3/agent.py:192
+#: neutron/agent/l3/agent.py:193
 #, python-format
 msgid ""
 "l3-agent cannot check service plugins enabled at the neutron server when "
@@ -125,29 +118,29 @@ msgid ""
 "warning. Detail message: %s"
 msgstr ""
 
-#: neutron/agent/l3/agent.py:204
+#: neutron/agent/l3/agent.py:205
 #, python-format
 msgid ""
 "l3-agent cannot check service plugins enabled on the neutron server. "
 "Retrying. Detail message: %s"
 msgstr ""
 
-#: neutron/agent/l3/agent.py:334
+#: neutron/agent/l3/agent.py:337
 #, python-format
 msgid "Info for router %s was not found. Skipping router removal"
 msgstr ""
 
-#: neutron/agent/l3/router_info.py:206
+#: neutron/agent/l3/router_info.py:208
 #, python-format
 msgid "Unable to configure IP address for floating IP: %s"
 msgstr ""
 
-#: neutron/agent/linux/dhcp.py:227
+#: neutron/agent/linux/dhcp.py:228
 #, python-format
 msgid "Failed trying to delete interface: %s"
 msgstr ""
 
-#: neutron/agent/linux/dhcp.py:235
+#: neutron/agent/linux/dhcp.py:236
 #, python-format
 msgid "Failed trying to delete namespace: %s"
 msgstr ""
@@ -158,14 +151,14 @@ msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
 #: neutron/agent/linux/ebtables_manager.py:237
-#: neutron/agent/linux/iptables_manager.py:247
+#: neutron/agent/linux/iptables_manager.py:249
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: neutron/agent/linux/iptables_manager.py:696
+#: neutron/agent/linux/iptables_manager.py:702
 #, python-format
 msgid "Attempted to get traffic counters of chain %s which does not exist"
 msgstr ""
@@ -180,7 +173,7 @@ msgid ""
 "usually occurs when shared secrets do not match."
 msgstr ""
 
-#: neutron/api/api_common.py:102
+#: neutron/api/api_common.py:103
 #, python-format
 msgid ""
 "Invalid value for pagination_max_limit: %s. It should be an integer "
@@ -222,20 +215,19 @@ msgid ""
 "inactive agents."
 msgstr ""
 
-#: neutron/api/rpc/handlers/dhcp_rpc.py:94
+#: neutron/api/rpc/handlers/dhcp_rpc.py:100
 #, python-format
 msgid ""
 "Action %(action)s for network %(net_id)s could not complete successfully:"
 " %(reason)s"
 msgstr ""
 
-#: neutron/api/rpc/handlers/dhcp_rpc.py:146
-#: neutron/api/rpc/handlers/dhcp_rpc.py:210
+#: neutron/api/rpc/handlers/dhcp_rpc.py:152
 #, python-format
 msgid "Network %s could not be found, it might have been deleted concurrently."
 msgstr ""
 
-#: neutron/api/rpc/handlers/dhcp_rpc.py:279
+#: neutron/api/rpc/handlers/dhcp_rpc.py:203
 #, python-format
 msgid "Updating lease expiration is now deprecated. Issued  from host %s."
 msgstr ""
@@ -271,14 +263,14 @@ msgid ""
 "in case there was a clock adjustment."
 msgstr ""
 
-#: neutron/db/agentschedulers_db.py:274
+#: neutron/db/agentschedulers_db.py:275
 #, python-format
 msgid ""
 "Removing network %(network)s from agent %(agent)s because the agent did "
 "not report to the server in the last %(dead_time)s seconds."
 msgstr ""
 
-#: neutron/db/l3_agentschedulers_db.py:104
+#: neutron/db/l3_agentschedulers_db.py:105
 #, python-format
 msgid ""
 "Rescheduling router %(router)s from agent %(agent)s because the agent did"
@@ -289,7 +281,7 @@ msgstr ""
 msgid "No active L3 agents found for SNAT"
 msgstr ""
 
-#: neutron/db/securitygroups_rpc_base.py:372
+#: neutron/db/securitygroups_rpc_base.py:383
 #, python-format
 msgid "No valid gateway port on subnet %s is found for IPv6 RA"
 msgstr ""
@@ -363,36 +355,36 @@ msgstr ""
 msgid "Ignoring admin_state_up=False for router=%r.  Overriding with True"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:84
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:85
 msgid "VXLAN is enabled, a valid local_ip must be provided"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:98
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:99
 msgid "Invalid Network ID, will lead to incorrect bridge name"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:105
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:106
 msgid "Invalid VLAN ID, will lead to incorrect subinterface name"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:112
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:113
 msgid "Invalid Interface ID, will lead to incorrect tap device name"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:121
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:122
 #, python-format
 msgid "Invalid Segmentation ID: %s, will lead to incorrect vxlan device name"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:526
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:562
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:527
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:563
 #, python-format
 msgid ""
 "Option \"%(option)s\" must be supported by command \"%(command)s\" to "
 "enable %(mode)s mode"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:556
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:557
 msgid ""
 "VXLAN muticast group must be provided in vxlan_group option to enable "
 "VXLAN MCAST mode"
@@ -403,23 +395,23 @@ msgstr ""
 msgid "Could not expand segment %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:532
+#: neutron/plugins/ml2/plugin.py:527
 #, python-format
 msgid ""
 "In _notify_port_updated(), no bound segment for port %(port_id)s on "
 "network %(network_id)s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:783
+#: neutron/plugins/ml2/plugin.py:778
 msgid "A concurrent port creation has occurred"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1391
+#: neutron/plugins/ml2/plugin.py:1396
 #, python-format
 msgid "Port %(port)s updated up by agent not found"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1423
+#: neutron/plugins/ml2/plugin.py:1428
 #, python-format
 msgid "Port %s not found during update"
 msgstr ""
@@ -442,35 +434,30 @@ msgstr ""
 msgid "Attempting to bind with dead agent: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_flat.py:134
+#: neutron/plugins/ml2/drivers/type_flat.py:135
 #, python-format
 msgid "No flat network found on physical network %s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_gre.py:106
+#: neutron/plugins/ml2/drivers/type_gre.py:107
 msgid "Gre allocations were already created."
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_gre.py:160
-#, python-format
-msgid "Gre endpoint with ip %s already exists"
-msgstr ""
-
-#: neutron/plugins/ml2/drivers/type_tunnel.py:182
+#: neutron/plugins/ml2/drivers/type_tunnel.py:179
 #, python-format
 msgid "%(type)s tunnel %(id)s not found"
 msgstr ""
 
+#: neutron/plugins/ml2/drivers/type_tunnel.py:236
+#, python-format
+msgid "Endpoint with ip %s already exists"
+msgstr ""
+
 #: neutron/plugins/ml2/drivers/type_vlan.py:257
 #, python-format
 msgid "No vlan_id %(vlan_id)s found on physical network %(physical_network)s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vxlan.py:168
-#, python-format
-msgid "Vxlan endpoint with ip %s already exists"
-msgstr ""
-
 #: neutron/plugins/ml2/drivers/cisco/apic/apic_sync.py:67
 #, python-format
 msgid "Create network postcommit failed for network %s"
@@ -529,57 +516,57 @@ msgid ""
 " %s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_dvr_neutron_agent.py:189
+#: neutron/plugins/openvswitch/agent/ovs_dvr_neutron_agent.py:190
 #, python-format
 msgid ""
 "L2 agent could not get DVR MAC address from server. Retrying. Detailed "
 "message: %s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:516
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:525
 #, python-format
 msgid "Action %s not supported"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1010
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:920
 #, python-format
 msgid ""
 "Creating an interface named %(name)s exceeds the %(limit)d character "
 "limitation. It was shortened to %(new_name)s to fit."
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1211
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1120
 #, python-format
 msgid "VIF port: %s has no ofport configured, and might not be able to transmit"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1323
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1228
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1483
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1388
 #, python-format
 msgid "Invalid remote IP: %s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1526
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1431
 msgid "OVS is restarted. OVSNeutronAgent will reset bridges and recover ports."
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1530
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1434
 msgid ""
 "OVS is dead. OVSNeutronAgent will keep running and checking OVS status "
 "periodically."
 msgstr ""
 
-#: neutron/plugins/sriovnicagent/eswitch_manager.py:147
-#: neutron/plugins/sriovnicagent/eswitch_manager.py:160
+#: neutron/plugins/sriovnicagent/eswitch_manager.py:148
+#: neutron/plugins/sriovnicagent/eswitch_manager.py:161
 #, python-format
 msgid "Cannot find vf index for pci slot %s"
 msgstr ""
 
-#: neutron/plugins/sriovnicagent/eswitch_manager.py:283
+#: neutron/plugins/sriovnicagent/eswitch_manager.py:284
 #, python-format
 msgid "device pci mismatch: %(device_mac)s - %(pci_slot)s"
 msgstr ""
diff --git a/neutron/locale/neutron.pot b/neutron/locale/neutron.pot
index abd550bbcf3..07a84488698 100644
--- a/neutron/locale/neutron.pot
+++ b/neutron/locale/neutron.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: neutron 2015.2.0.dev533\n"
+"Project-Id-Version: neutron 2015.2.0.dev464\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-06-02 06:15+0000\n"
+"POT-Creation-Date: 2015-06-11 06:02+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"
@@ -17,42 +17,42 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: neutron/context.py:102
+#: neutron/context.py:97
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
 
-#: neutron/manager.py:74
+#: neutron/manager.py:75
 #, python-format
 msgid "dhcp_agents_per_network must be >= 1. '%s' is invalid."
 msgstr ""
 
-#: neutron/manager.py:86
+#: neutron/manager.py:87
 msgid "Neutron core_plugin not configured!"
 msgstr ""
 
-#: neutron/manager.py:134 neutron/manager.py:146
+#: neutron/manager.py:135 neutron/manager.py:147
 msgid "Plugin not found."
 msgstr ""
 
-#: neutron/manager.py:189
+#: neutron/manager.py:190
 #, python-format
 msgid "Multiple plugins for service %s were configured"
 msgstr ""
 
-#: neutron/policy.py:246
+#: neutron/policy.py:201
 #, python-format
 msgid ""
 "Unable to identify a target field from:%s. Match should be in the form "
 "%%(<field_name>)s"
 msgstr ""
 
-#: neutron/policy.py:276
+#: neutron/policy.py:231
 #, python-format
 msgid "Unable to find resource name in %s"
 msgstr ""
 
-#: neutron/policy.py:285
+#: neutron/policy.py:240
 #, python-format
 msgid ""
 "Unable to verify match:%(match)s as the parent resource: %(res)s was not "
@@ -91,59 +91,59 @@ msgstr ""
 msgid "Access to this resource was denied."
 msgstr ""
 
-#: neutron/service.py:42
+#: neutron/service.py:41
 msgid "Seconds between running periodic tasks"
 msgstr ""
 
-#: neutron/service.py:45
+#: neutron/service.py:44
 msgid "Number of separate API worker processes for service"
 msgstr ""
 
-#: neutron/service.py:48
+#: neutron/service.py:47
 msgid "Number of RPC worker processes for service"
 msgstr ""
 
-#: neutron/service.py:51
+#: neutron/service.py:50
 msgid ""
 "Range of seconds to randomly delay when starting the periodic task "
 "scheduler to reduce stampeding. (Disable by setting to 0)"
 msgstr ""
 
-#: neutron/wsgi.py:49
+#: neutron/wsgi.py:51
 msgid "Number of backlog requests to configure the socket with"
 msgstr ""
 
-#: neutron/wsgi.py:53
+#: neutron/wsgi.py:55
 msgid ""
 "Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not "
 "supported on OS X."
 msgstr ""
 
-#: neutron/wsgi.py:57
+#: neutron/wsgi.py:59
 msgid "Number of seconds to keep retrying to listen"
 msgstr ""
 
-#: neutron/wsgi.py:60
+#: neutron/wsgi.py:62
 msgid "Max header line to accommodate large tokens"
 msgstr ""
 
-#: neutron/wsgi.py:63
+#: neutron/wsgi.py:65
 msgid "Enable SSL on the API server"
 msgstr ""
 
-#: neutron/wsgi.py:65
+#: neutron/wsgi.py:67
 msgid "CA certificate file to use to verify connecting clients"
 msgstr ""
 
-#: neutron/wsgi.py:68
+#: neutron/wsgi.py:70
 msgid "Certificate file to use when starting the server securely"
 msgstr ""
 
-#: neutron/wsgi.py:71
+#: neutron/wsgi.py:73
 msgid "Private key file to use when starting the server securely"
 msgstr ""
 
-#: neutron/wsgi.py:75
+#: neutron/wsgi.py:77
 msgid ""
 "Determines if connections are allowed to be held open by clients after a "
 "request is fulfilled. A value of False will ensure that the socket "
@@ -151,62 +151,62 @@ msgid ""
 " client."
 msgstr ""
 
-#: neutron/wsgi.py:81
+#: neutron/wsgi.py:83
 msgid ""
 "Timeout for client connections socket operations. If an incoming "
 "connection is idle for this number of seconds it will be closed. A value "
 "of '0' means wait forever."
 msgstr ""
 
-#: neutron/wsgi.py:169
+#: neutron/wsgi.py:176
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s after trying for %(time)d seconds"
 msgstr ""
 
-#: neutron/wsgi.py:189
+#: neutron/wsgi.py:196
 #, python-format
 msgid "Unable to find ssl_cert_file : %s"
 msgstr ""
 
-#: neutron/wsgi.py:195
+#: neutron/wsgi.py:202
 #, python-format
 msgid "Unable to find ssl_key_file : %s"
 msgstr ""
 
-#: neutron/wsgi.py:200
+#: neutron/wsgi.py:207
 #, python-format
 msgid "Unable to find ssl_ca_file : %s"
 msgstr ""
 
-#: neutron/wsgi.py:484
+#: neutron/wsgi.py:495
 msgid "Cannot understand JSON"
 msgstr ""
 
-#: neutron/wsgi.py:650
+#: neutron/wsgi.py:661
 msgid "You must implement __call__"
 msgstr ""
 
-#: neutron/wsgi.py:738 neutron/api/v2/base.py:195 neutron/api/v2/base.py:343
-#: neutron/api/v2/base.py:486 neutron/api/v2/base.py:546
+#: neutron/wsgi.py:749 neutron/api/v2/base.py:196 neutron/api/v2/base.py:344
+#: neutron/api/v2/base.py:487 neutron/api/v2/base.py:547
 #: neutron/extensions/l3agentscheduler.py:51
 #: neutron/extensions/l3agentscheduler.py:94
 msgid "The resource could not be found."
 msgstr ""
 
-#: neutron/wsgi.py:787
+#: neutron/wsgi.py:798
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: neutron/wsgi.py:791
+#: neutron/wsgi.py:802
 msgid "Malformed request body"
 msgstr ""
 
-#: neutron/wsgi.py:928
+#: neutron/wsgi.py:939
 #, python-format
 msgid "The requested content type %s is invalid."
 msgstr ""
 
-#: neutron/wsgi.py:981
+#: neutron/wsgi.py:992
 msgid "Could not deserialize data"
 msgstr ""
 
@@ -275,20 +275,20 @@ msgstr ""
 msgid "Timeout in seconds for ovs-vsctl commands"
 msgstr ""
 
-#: neutron/agent/common/ovs_lib.py:440
+#: neutron/agent/common/ovs_lib.py:441
 #, python-format
 msgid "Unable to determine mac address for %s"
 msgstr ""
 
-#: neutron/agent/common/ovs_lib.py:548
+#: neutron/agent/common/ovs_lib.py:549
 msgid "Cannot match priority on flow deletion or modification"
 msgstr ""
 
-#: neutron/agent/common/ovs_lib.py:553
+#: neutron/agent/common/ovs_lib.py:554
 msgid "Must specify one or more actions on flow addition or modification"
 msgstr ""
 
-#: neutron/agent/dhcp/agent.py:589
+#: neutron/agent/dhcp/agent.py:580
 #, python-format
 msgid "Agent updated: %(payload)s"
 msgstr ""
@@ -343,7 +343,7 @@ msgstr ""
 msgid "Use broadcast in DHCP replies"
 msgstr ""
 
-#: neutron/agent/l3/agent.py:278
+#: neutron/agent/l3/agent.py:279
 msgid ""
 "The 'gateway_external_network_id' option must be configured for this "
 "agent as Neutron has more than one external network."
@@ -537,7 +537,7 @@ msgid "Location of temporary ebtables table files."
 msgstr ""
 
 #: neutron/agent/linux/ebtables_manager.py:210
-#: neutron/agent/linux/iptables_manager.py:211
+#: neutron/agent/linux/iptables_manager.py:212
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
@@ -586,7 +586,7 @@ msgid "Authentication URL"
 msgstr ""
 
 #: neutron/agent/linux/interface.py:60 neutron/agent/metadata/config.py:63
-#: neutron/common/config.py:49 neutron/plugins/metaplugin/common/config.py:72
+#: neutron/common/config.py:50 neutron/plugins/metaplugin/common/config.py:72
 msgid "The type of authentication to use"
 msgstr ""
 
@@ -641,7 +641,7 @@ msgstr ""
 msgid "Location to store IPv6 RA config files"
 msgstr ""
 
-#: neutron/agent/linux/utils.py:119
+#: neutron/agent/linux/utils.py:120
 msgid ""
 "\n"
 "Command: {cmd}\n"
@@ -796,7 +796,7 @@ msgid ""
 " log file."
 msgstr ""
 
-#: neutron/agent/ovsdb/api.py:30
+#: neutron/agent/ovsdb/api.py:32
 msgid "The interface for interacting with the OVSDB"
 msgstr ""
 
@@ -833,33 +833,33 @@ msgid ""
 "Stderr: %(stderr)s"
 msgstr ""
 
-#: neutron/api/api_common.py:116
+#: neutron/api/api_common.py:117
 #, python-format
 msgid "Limit must be an integer 0 or greater and not '%d'"
 msgstr ""
 
-#: neutron/api/api_common.py:133
+#: neutron/api/api_common.py:134
 msgid "The number of sort_keys and sort_dirs must be same"
 msgstr ""
 
-#: neutron/api/api_common.py:138
+#: neutron/api/api_common.py:139
 #, python-format
 msgid "%s is invalid attribute for sort_keys"
 msgstr ""
 
-#: neutron/api/api_common.py:142
+#: neutron/api/api_common.py:143
 #, python-format
 msgid ""
 "%(invalid_dirs)s is invalid value for sort_dirs, valid value is '%(asc)s'"
 " and '%(desc)s'"
 msgstr ""
 
-#: neutron/api/api_common.py:316 neutron/api/v2/base.py:617
+#: neutron/api/api_common.py:317 neutron/api/v2/base.py:618
 #, python-format
 msgid "Unable to find '%s' in request body"
 msgstr ""
 
-#: neutron/api/api_common.py:323
+#: neutron/api/api_common.py:324
 #, python-format
 msgid "Failed to parse request. Parameter '%s' not specified"
 msgstr ""
@@ -877,7 +877,7 @@ msgstr ""
 msgid "Unknown API version specified"
 msgstr ""
 
-#: neutron/api/rpc/handlers/dhcp_rpc.py:77
+#: neutron/api/rpc/handlers/dhcp_rpc.py:83
 msgid "Unrecognized action"
 msgstr ""
 
@@ -1055,68 +1055,68 @@ msgstr ""
 msgid "'%s' is not of the form <key>=[value]"
 msgstr ""
 
-#: neutron/api/v2/base.py:90
+#: neutron/api/v2/base.py:91
 msgid "Native pagination depend on native sorting"
 msgstr ""
 
-#: neutron/api/v2/base.py:507
+#: neutron/api/v2/base.py:508
 #, python-format
 msgid "Invalid format: %s"
 msgstr ""
 
-#: neutron/api/v2/base.py:569
+#: neutron/api/v2/base.py:570
 msgid ""
 "Specifying 'tenant_id' other than authenticated tenant in request "
 "requires admin privileges"
 msgstr ""
 
-#: neutron/api/v2/base.py:577
+#: neutron/api/v2/base.py:578
 msgid "Running without keystone AuthN requires  that tenant_id is specified"
 msgstr ""
 
-#: neutron/api/v2/base.py:595
+#: neutron/api/v2/base.py:596
 msgid "Resource body required"
 msgstr ""
 
-#: neutron/api/v2/base.py:601
+#: neutron/api/v2/base.py:602
 msgid "Bulk operation not supported"
 msgstr ""
 
-#: neutron/api/v2/base.py:604
+#: neutron/api/v2/base.py:605
 msgid "Resources required"
 msgstr ""
 
-#: neutron/api/v2/base.py:614
+#: neutron/api/v2/base.py:615
 msgid "Body contains invalid data"
 msgstr ""
 
-#: neutron/api/v2/base.py:628
+#: neutron/api/v2/base.py:629
 #, python-format
 msgid "Failed to parse request. Required attribute '%s' not specified"
 msgstr ""
 
-#: neutron/api/v2/base.py:635
+#: neutron/api/v2/base.py:636
 #, python-format
 msgid "Attribute '%s' not allowed in POST"
 msgstr ""
 
-#: neutron/api/v2/base.py:640
+#: neutron/api/v2/base.py:641
 #, python-format
 msgid "Cannot update read-only attribute %s"
 msgstr ""
 
-#: neutron/api/v2/base.py:658
+#: neutron/api/v2/base.py:659
 #, python-format
 msgid "Invalid input for %(attr)s. Reason: %(reason)s."
 msgstr ""
 
-#: neutron/api/v2/base.py:667 neutron/extensions/allowedaddresspairs.py:75
+#: neutron/api/v2/base.py:668 neutron/extensions/allowedaddresspairs.py:75
 #: neutron/extensions/multiprovidernet.py:45
 #, python-format
 msgid "Unrecognized attribute(s) '%s'"
 msgstr ""
 
-#: neutron/api/v2/base.py:686
+#: neutron/api/v2/base.py:687
 #, python-format
 msgid "Tenant %(tenant_id)s not allowed to create %(resource)s on this network"
 msgstr ""
@@ -1185,191 +1185,191 @@ msgstr ""
 msgid "Check ebtables installation"
 msgstr ""
 
-#: neutron/common/config.py:41
+#: neutron/common/config.py:42
 msgid "The host IP to bind to"
 msgstr ""
 
-#: neutron/common/config.py:43
+#: neutron/common/config.py:44
 msgid "The port to bind to"
 msgstr ""
 
-#: neutron/common/config.py:45
+#: neutron/common/config.py:46
 msgid "The API paste config file to use"
 msgstr ""
 
-#: neutron/common/config.py:47
+#: neutron/common/config.py:48
 msgid "The path for API extensions"
 msgstr ""
 
-#: neutron/common/config.py:51
+#: neutron/common/config.py:52
 msgid "The core plugin Neutron will use"
 msgstr ""
 
-#: neutron/common/config.py:53 neutron/db/migration/cli.py:40
+#: neutron/common/config.py:54 neutron/db/migration/cli.py:40
 msgid "The service plugins Neutron will use"
 msgstr ""
 
-#: neutron/common/config.py:55
+#: neutron/common/config.py:56
 msgid "The base MAC address Neutron will use for VIFs"
 msgstr ""
 
-#: neutron/common/config.py:57
+#: neutron/common/config.py:58
 msgid "How many times Neutron will retry MAC generation"
 msgstr ""
 
-#: neutron/common/config.py:59
+#: neutron/common/config.py:60
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: neutron/common/config.py:61
+#: neutron/common/config.py:62
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: neutron/common/config.py:63
+#: neutron/common/config.py:64
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: neutron/common/config.py:65
+#: neutron/common/config.py:66
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: neutron/common/config.py:69
+#: neutron/common/config.py:70
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: neutron/common/config.py:71
+#: neutron/common/config.py:72
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: neutron/common/config.py:73
+#: neutron/common/config.py:74
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: neutron/common/config.py:75
+#: neutron/common/config.py:76
 msgid "Default IPv4 subnet-pool to be used for automatic subnet CIDR allocation"
 msgstr ""
 
-#: neutron/common/config.py:78
+#: neutron/common/config.py:79
 msgid "Default IPv6 subnet-pool to be used for automatic subnet CIDR allocation"
 msgstr ""
 
-#: neutron/common/config.py:82
+#: neutron/common/config.py:83
 msgid ""
 "DHCP lease duration (in seconds). Use -1 to tell dnsmasq to use infinite "
 "lease times."
 msgstr ""
 
-#: neutron/common/config.py:85
+#: neutron/common/config.py:86
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: neutron/common/config.py:88
+#: neutron/common/config.py:89
 msgid "Allow overlapping IP support in Neutron"
 msgstr ""
 
-#: neutron/common/config.py:90
+#: neutron/common/config.py:91
 msgid ""
 "Hostname to be used by the neutron server, agents and services running on"
 " this machine. All the agents and services running on this machine must "
 "use the same host value."
 msgstr ""
 
-#: neutron/common/config.py:95
+#: neutron/common/config.py:96
 msgid ""
 "Ensure that configured gateway is on subnet. For IPv6, validate only if "
 "gateway is not a link local address. Deprecated, to be removed during the"
 " K release, at which point the check will be mandatory."
 msgstr ""
 
-#: neutron/common/config.py:101
+#: neutron/common/config.py:102
 msgid "Send notification to nova when port status changes"
 msgstr ""
 
-#: neutron/common/config.py:103
+#: neutron/common/config.py:104
 msgid ""
 "Send notification to nova when port data (fixed_ips/floatingip) changes "
 "so nova can update its cache."
 msgstr ""
 
-#: neutron/common/config.py:107
+#: neutron/common/config.py:108
 msgid ""
 "URL for connection to nova. Deprecated in favour of an auth plugin in "
 "[nova]."
 msgstr ""
 
-#: neutron/common/config.py:110
+#: neutron/common/config.py:111
 msgid ""
 "Username for connecting to nova in admin context. Deprecated in favour of"
 " an auth plugin in [nova]."
 msgstr ""
 
-#: neutron/common/config.py:113
+#: neutron/common/config.py:114
 msgid ""
 "Password for connection to nova in admin context. Deprecated in favour of"
 " an auth plugin in [nova]."
 msgstr ""
 
-#: neutron/common/config.py:117
+#: neutron/common/config.py:118
 msgid ""
 "The uuid of the admin nova tenant. Deprecated in favour of an auth plugin"
 " in [nova]."
 msgstr ""
 
-#: neutron/common/config.py:120
+#: neutron/common/config.py:121
 msgid ""
 "The name of the admin nova tenant. Deprecated in favour of an auth plugin"
 " in [nova]."
 msgstr ""
 
-#: neutron/common/config.py:124
+#: neutron/common/config.py:125
 msgid ""
 "Authorization URL for connecting to nova in admin context. Deprecated in "
 "favour of an auth plugin in [nova]."
 msgstr ""
 
-#: neutron/common/config.py:128
+#: neutron/common/config.py:129
 msgid ""
 "Number of seconds between sending events to nova if there are any events "
 "to send."
 msgstr ""
 
-#: neutron/common/config.py:131
+#: neutron/common/config.py:132
 msgid ""
 "If True, effort is made to advertise MTU settings to VMs via network "
 "methods (DHCP and RA MTU options) when the network's preferred MTU is "
 "known."
 msgstr ""
 
-#: neutron/common/config.py:135
+#: neutron/common/config.py:136
 msgid "IPAM driver to use."
 msgstr ""
 
-#: neutron/common/config.py:137
+#: neutron/common/config.py:138
 msgid ""
 "If True, then allow plugins that support it to create VLAN transparent "
 "networks."
 msgstr ""
 
-#: neutron/common/config.py:144
+#: neutron/common/config.py:145
 msgid ""
 "Where to store Neutron state files. This directory must be writable by "
 "the agent."
 msgstr ""
 
-#: neutron/common/config.py:176
+#: neutron/common/config.py:177
 msgid ""
 "Name of nova region to use. Useful if keystone manages more than one "
 "region."
 msgstr ""
 
-#: neutron/common/config.py:198
+#: neutron/common/config.py:199
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: neutron/common/config.py:231
+#: neutron/common/config.py:240
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -1831,34 +1831,34 @@ msgstr ""
 msgid "Bad prefix type for generate IPv6 address by EUI-64: %s"
 msgstr ""
 
-#: neutron/common/utils.py:202
+#: neutron/common/utils.py:203
 #: neutron/plugins/sriovnicagent/common/config.py:36
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: neutron/common/utils.py:205
+#: neutron/common/utils.py:206
 #: neutron/plugins/sriovnicagent/common/config.py:39
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: neutron/common/utils.py:208
+#: neutron/common/utils.py:209
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: neutron/common/utils.py:210
+#: neutron/common/utils.py:211
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: neutron/common/utils.py:213
+#: neutron/common/utils.py:214
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: neutron/common/utils.py:407
+#: neutron/common/utils.py:408
 msgid "Illegal IP version number"
 msgstr ""
 
@@ -1912,57 +1912,40 @@ msgid ""
 "such agents is available if this option is True."
 msgstr ""
 
-#: neutron/db/common_db_mixin.py:123
+#: neutron/db/common_db_mixin.py:138
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:393
-msgid "IP allocation requires subnet_id or ip_address"
-msgstr ""
-
-#: neutron/db/db_base_plugin_v2.py:410
-#, python-format
-msgid ""
-"Failed to create port on network %(network_id)s, because fixed_ips "
-"included invalid subnet %(subnet_id)s"
-msgstr ""
-
-#: neutron/db/db_base_plugin_v2.py:436
-#, python-format
-msgid ""
-"IPv6 address %(address)s can not be directly assigned to a port on subnet"
-" %(id)s since the subnet is configured for automatic addresses"
-msgstr ""
-
-#: neutron/db/db_base_plugin_v2.py:455 neutron/db/db_base_plugin_v2.py:503
+#: neutron/db/db_base_plugin_v2.py:134
+#: neutron/db/ipam_non_pluggable_backend.py:263
 #: neutron/plugins/opencontrail/contrail_plugin.py:390
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:627
+#: neutron/db/db_base_plugin_v2.py:186
 msgid "0 is not allowed as CIDR prefix length"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:637
+#: neutron/db/db_base_plugin_v2.py:196
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:732 neutron/db/db_base_plugin_v2.py:736
+#: neutron/db/db_base_plugin_v2.py:224 neutron/db/db_base_plugin_v2.py:228
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:814
+#: neutron/db/db_base_plugin_v2.py:306
 #, python-format
 msgid ""
 "Invalid CIDR %s for IPv6 address mode. OpenStack uses the EUI-64 address "
 "format, which requires the prefix to be /64."
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:822
+#: neutron/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "ipv6_ra_mode set to '%(ra_mode)s' with ipv6_address_mode set to "
@@ -1970,77 +1953,77 @@ msgid ""
 "the same value"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:830
+#: neutron/db/db_base_plugin_v2.py:322
 msgid ""
 "ipv6_ra_mode or ipv6_address_mode cannot be set when enable_dhcp is set "
 "to False."
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:836
+#: neutron/db/db_base_plugin_v2.py:328
 msgid "Cannot disable enable_dhcp with ipv6 attributes set"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1052
+#: neutron/db/db_base_plugin_v2.py:458
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1079
+#: neutron/db/db_base_plugin_v2.py:485
 msgid "Subnet has a prefix length that is incompatible with DHCP service enabled."
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1100
+#: neutron/db/db_base_plugin_v2.py:506
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1120 neutron/db/db_base_plugin_v2.py:1134
+#: neutron/db/db_base_plugin_v2.py:526 neutron/db/db_base_plugin_v2.py:540
 #: neutron/plugins/opencontrail/contrail_plugin.py:313
 msgid "new subnet"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1127
+#: neutron/db/db_base_plugin_v2.py:533
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1143
+#: neutron/db/db_base_plugin_v2.py:549
 msgid "ipv6_ra_mode is not valid when ip_version is 4"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1147
+#: neutron/db/db_base_plugin_v2.py:553
 msgid "ipv6_address_mode is not valid when ip_version is 4"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1296
+#: neutron/db/db_base_plugin_v2.py:668
 msgid "allocation_pools allowed only for specific subnet requests."
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1307
+#: neutron/db/db_base_plugin_v2.py:679
 #, python-format
 msgid "Cannot allocate IPv%(req_ver)s subnet from IPv%(pool_ver)s subnet pool"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1385
+#: neutron/db/db_base_plugin_v2.py:757
 msgid "ip_version must be specified in the absence of cidr and subnetpool_id"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1402
+#: neutron/db/db_base_plugin_v2.py:774
 msgid "cidr and prefixlen must not be supplied together"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1413
+#: neutron/db/db_base_plugin_v2.py:785
 msgid "A cidr must be specified in the absence of a subnet pool"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1717
+#: neutron/db/db_base_plugin_v2.py:1037
 msgid "Existing prefixes must be a subset of the new prefixes"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1784
+#: neutron/db/db_base_plugin_v2.py:1104
 msgid "Subnet pool has existing allocations"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1791
+#: neutron/db/db_base_plugin_v2.py:1111
 msgid "mac address update"
 msgstr ""
 
@@ -2060,56 +2043,74 @@ msgstr ""
 msgid "the nexthop is used by router"
 msgstr ""
 
-#: neutron/db/l3_agentschedulers_db.py:44
+#: neutron/db/ipam_non_pluggable_backend.py:201
+msgid "IP allocation requires subnet_id or ip_address"
+msgstr ""
+
+#: neutron/db/ipam_non_pluggable_backend.py:218
+#, python-format
+msgid ""
+"Failed to create port on network %(network_id)s, because fixed_ips "
+"included invalid subnet %(subnet_id)s"
+msgstr ""
+
+#: neutron/db/ipam_non_pluggable_backend.py:244
+#, python-format
+msgid ""
+"IPv6 address %(address)s can not be directly assigned to a port on subnet"
+" %(id)s since the subnet is configured for automatic addresses"
+msgstr ""
+
+#: neutron/db/l3_agentschedulers_db.py:45
 msgid "Driver to use for scheduling router to a default L3 agent"
 msgstr ""
 
-#: neutron/db/l3_agentschedulers_db.py:47
+#: neutron/db/l3_agentschedulers_db.py:48
 msgid "Allow auto scheduling of routers to L3 agent."
 msgstr ""
 
-#: neutron/db/l3_agentschedulers_db.py:49
+#: neutron/db/l3_agentschedulers_db.py:50
 msgid ""
 "Automatically reschedule routers from offline L3 agents to online L3 "
 "agents."
 msgstr ""
 
-#: neutron/db/l3_db.py:271
+#: neutron/db/l3_db.py:272
 #, python-format
 msgid "No eligible l3 agent associated with external network %s found"
 msgstr ""
 
-#: neutron/db/l3_db.py:309
+#: neutron/db/l3_db.py:310
 #, python-format
 msgid "Network %s is not an external network"
 msgstr ""
 
-#: neutron/db/l3_db.py:319
+#: neutron/db/l3_db.py:320
 #, python-format
 msgid "External IP %s is the same as the gateway IP"
 msgstr ""
 
-#: neutron/db/l3_db.py:469
+#: neutron/db/l3_db.py:470
 #, python-format
 msgid "Router already has a port on subnet %s"
 msgstr ""
 
-#: neutron/db/l3_db.py:483
+#: neutron/db/l3_db.py:484
 #, python-format
 msgid ""
 "Cidr %(subnet_cidr)s of subnet %(subnet_id)s overlaps with cidr %(cidr)s "
 "of subnet %(sub_id)s"
 msgstr ""
 
-#: neutron/db/l3_db.py:499 neutron/plugins/opencontrail/contrail_plugin.py:501
+#: neutron/db/l3_db.py:500 neutron/plugins/opencontrail/contrail_plugin.py:501
 msgid "Either subnet_id or port_id must be specified"
 msgstr ""
 
-#: neutron/db/l3_db.py:503 neutron/plugins/opencontrail/contrail_plugin.py:511
+#: neutron/db/l3_db.py:504 neutron/plugins/opencontrail/contrail_plugin.py:511
 msgid "Cannot specify both subnet-id and port-id"
 msgstr ""
 
-#: neutron/db/l3_db.py:520
+#: neutron/db/l3_db.py:521
 #, python-format
 msgid ""
 "Cannot have multiple router ports with the same network id if both "
@@ -2117,63 +2118,63 @@ msgid ""
 "id %(nid)s"
 msgstr ""
 
-#: neutron/db/l3_db.py:562
+#: neutron/db/l3_db.py:563
 msgid "Subnet for router interface must have a gateway IP"
 msgstr ""
 
-#: neutron/db/l3_db.py:566
+#: neutron/db/l3_db.py:567
 #, python-format
 msgid ""
 "IPv6 subnet %s configured to receive RAs from an external router cannot "
 "be added to Neutron Router."
 msgstr ""
 
-#: neutron/db/l3_db.py:778
+#: neutron/db/l3_db.py:779
 #, python-format
 msgid "Cannot add floating IP to port on subnet %s which has no gateway_ip"
 msgstr ""
 
-#: neutron/db/l3_db.py:819
+#: neutron/db/l3_db.py:820
 #, python-format
 msgid ""
 "Port %(port_id)s is associated with a different tenant than Floating IP "
 "%(floatingip_id)s and therefore cannot be bound."
 msgstr ""
 
-#: neutron/db/l3_db.py:823
+#: neutron/db/l3_db.py:824
 #, python-format
 msgid ""
 "Cannot create floating IP and bind it to Port %s, since that port is "
 "owned by a different tenant."
 msgstr ""
 
-#: neutron/db/l3_db.py:835
+#: neutron/db/l3_db.py:836
 #, python-format
 msgid "Port %(id)s does not have fixed ip %(address)s"
 msgstr ""
 
-#: neutron/db/l3_db.py:842
+#: neutron/db/l3_db.py:843
 #, python-format
 msgid "Cannot add floating IP to port %s that has no fixed IP addresses"
 msgstr ""
 
-#: neutron/db/l3_db.py:846
+#: neutron/db/l3_db.py:847
 #, python-format
 msgid ""
 "Port %s has multiple fixed IPs.  Must provide a specific IP when "
 "assigning a floating IP"
 msgstr ""
 
-#: neutron/db/l3_db.py:875
+#: neutron/db/l3_db.py:876
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
-#: neutron/db/l3_db.py:915
+#: neutron/db/l3_db.py:916
 #, python-format
 msgid "Network %s is not a valid external network"
 msgstr ""
 
-#: neutron/db/l3_db.py:1059
+#: neutron/db/l3_db.py:1060
 #, python-format
 msgid "has device owner %s"
 msgstr ""
@@ -2360,7 +2361,7 @@ msgid ""
 "implemented"
 msgstr ""
 
-#: neutron/db/migration/alembic_migrations/versions/14be42f3d0a5_default_sec_group_table.py:44
+#: neutron/db/migration/alembic_migrations/versions/14be42f3d0a5_default_sec_group_table.py:45
 #, python-format
 msgid ""
 "Some tenants have more than one security group named 'default': "
@@ -2966,40 +2967,6 @@ msgstr ""
 msgid "Rules must be an instance of dict or Rules, got %s instead"
 msgstr ""
 
-#: neutron/openstack/common/versionutils.py:108
-#, python-format
-msgid ""
-"%(what)s is deprecated as of %(as_of)s in favor of %(in_favor_of)s and "
-"may be removed in %(remove_in)s."
-msgstr ""
-
-#: neutron/openstack/common/versionutils.py:112
-#, python-format
-msgid ""
-"%(what)s is deprecated as of %(as_of)s and may be removed in "
-"%(remove_in)s. It will not be superseded."
-msgstr ""
-
-#: neutron/openstack/common/versionutils.py:116
-#, python-format
-msgid "%(what)s is deprecated as of %(as_of)s in favor of %(in_favor_of)s."
-msgstr ""
-
-#: neutron/openstack/common/versionutils.py:119
-#, python-format
-msgid "%(what)s is deprecated as of %(as_of)s. It will not be superseded."
-msgstr ""
-
-#: neutron/openstack/common/versionutils.py:241
-#, python-format
-msgid "Deprecated: %s"
-msgstr ""
-
-#: neutron/openstack/common/versionutils.py:259
-#, python-format
-msgid "Fatal call to deprecated config: %(msg)s"
-msgstr ""
-
 #: neutron/plugins/brocade/NeutronPlugin.py:62
 #: neutron/plugins/ml2/drivers/brocade/mechanism_brocade.py:22
 #: neutron/services/l3_router/brocade/l3_router_plugin.py:23
@@ -3964,6 +3931,13 @@ msgstr ""
 msgid "Enable server RPC compatibility with old agents"
 msgstr ""
 
+#: neutron/plugins/linuxbridge/common/config.py:66
+#: neutron/plugins/openvswitch/common/config.py:96
+msgid ""
+"Set new timeout in seconds for new rpc calls after agent receives "
+"SIGTERM. If value is set to 0, rpc timeout won't be changed"
+msgstr ""
+
 #: neutron/plugins/metaplugin/common/config.py:23
 msgid ""
 "Comma separated list of flavor:neutron_plugin for plugins to load. "
@@ -4072,16 +4046,16 @@ msgid ""
 "configured in type_drivers config option."
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:98
+#: neutron/plugins/ml2/managers.py:99
 msgid "network_type required"
 msgstr ""
 
-#: neutron/plugins/ml2/managers.py:205 neutron/plugins/ml2/managers.py:214
+#: neutron/plugins/ml2/managers.py:206 neutron/plugins/ml2/managers.py:215
 #, python-format
 msgid "network_type value '%s' not supported"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:232
+#: neutron/plugins/ml2/plugin.py:228
 msgid "binding:profile value too large"
 msgstr ""
 
@@ -4090,26 +4064,26 @@ msgstr ""
 msgid "%(method)s failed."
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_flat.py:33
+#: neutron/plugins/ml2/drivers/type_flat.py:34
 msgid ""
 "List of physical_network names with which flat networks can be created. "
 "Use * to allow flat networks with arbitrary physical_network names."
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_flat.py:75
+#: neutron/plugins/ml2/drivers/type_flat.py:76
 msgid "physical network name is empty"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_flat.py:93
+#: neutron/plugins/ml2/drivers/type_flat.py:94
 msgid "physical_network required for flat provider network"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_flat.py:96
+#: neutron/plugins/ml2/drivers/type_flat.py:97
 #, python-format
 msgid "physical_network '%s' unknown for flat provider network"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_flat.py:103
+#: neutron/plugins/ml2/drivers/type_flat.py:104
 #, python-format
 msgid "%s prohibited for flat provider network"
 msgstr ""
@@ -4120,35 +4094,35 @@ msgid ""
 "GRE tunnel IDs that are available for tenant network allocation"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_local.py:51
+#: neutron/plugins/ml2/drivers/type_local.py:52
 #, python-format
 msgid "%s prohibited for local provider network"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_tunnel.py:125
+#: neutron/plugins/ml2/drivers/type_tunnel.py:122
 #, python-format
 msgid "provider:physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_tunnel.py:132
+#: neutron/plugins/ml2/drivers/type_tunnel.py:129
 #, python-format
 msgid "%(key)s prohibited for %(tunnel)s provider network"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_tunnel.py:213
+#: neutron/plugins/ml2/drivers/type_tunnel.py:254
 msgid "Tunnel IP value needed by the ML2 plugin"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_tunnel.py:218
+#: neutron/plugins/ml2/drivers/type_tunnel.py:259
 msgid "Network type value needed by the ML2 plugin"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_tunnel.py:245
+#: neutron/plugins/ml2/drivers/type_tunnel.py:286
 #, python-format
 msgid "Tunnel IP %(ip)s in use with host %(host)s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_tunnel.py:264
+#: neutron/plugins/ml2/drivers/type_tunnel.py:305
 #, python-format
 msgid "Network type value '%s' not supported"
 msgstr ""
@@ -4180,13 +4154,13 @@ msgstr ""
 msgid "%s prohibited for VLAN provider network"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vxlan.py:35
+#: neutron/plugins/ml2/drivers/type_vxlan.py:34
 msgid ""
 "Comma-separated list of <vni_min>:<vni_max> tuples enumerating ranges of "
 "VXLAN VNI IDs that are available for tenant network allocation"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vxlan.py:39
+#: neutron/plugins/ml2/drivers/type_vxlan.py:38
 msgid "Multicast group for VXLAN. If unset, disables VXLAN multicast mode."
 msgstr ""
 
@@ -4383,25 +4357,6 @@ msgstr ""
 msgid "Add new policy profile attribute to port resource."
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/cisco/ncs/driver.py:29
-msgid "HTTP URL of Tail-f NCS REST interface."
-msgstr ""
-
-#: neutron/plugins/ml2/drivers/cisco/ncs/driver.py:31
-#: neutron/plugins/ml2/drivers/opendaylight/driver.py:32
-msgid "HTTP username for authentication"
-msgstr ""
-
-#: neutron/plugins/ml2/drivers/cisco/ncs/driver.py:33
-#: neutron/plugins/ml2/drivers/opendaylight/driver.py:34
-msgid "HTTP password for authentication"
-msgstr ""
-
-#: neutron/plugins/ml2/drivers/cisco/ncs/driver.py:35
-#: neutron/plugins/ml2/drivers/opendaylight/driver.py:36
-msgid "HTTP timeout in seconds."
-msgstr ""
-
 #: neutron/plugins/ml2/drivers/freescale/config.py:28
 msgid "CRD service Username."
 msgstr ""
@@ -4499,6 +4454,18 @@ msgstr ""
 msgid "HTTP URL of OpenDaylight REST interface."
 msgstr ""
 
+#: neutron/plugins/ml2/drivers/opendaylight/driver.py:32
+msgid "HTTP username for authentication"
+msgstr ""
+
+#: neutron/plugins/ml2/drivers/opendaylight/driver.py:34
+msgid "HTTP password for authentication"
+msgstr ""
+
+#: neutron/plugins/ml2/drivers/opendaylight/driver.py:36
+msgid "HTTP timeout in seconds."
+msgstr ""
+
 #: neutron/plugins/ml2/drivers/opendaylight/driver.py:38
 msgid "Tomcat session timeout in minutes."
 msgstr ""
@@ -4688,30 +4655,30 @@ msgstr ""
 msgid "Unable to connect to NVSD controller. Exiting after %(retries)s attempts"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:60
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:63
 #, python-format
 msgid ""
 "Unable to retrieve port details for devices: %(devices)s because of "
 "error: %(error)s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1594
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1624
 msgid ""
 "DVR deployments for VXLAN/GRE underlays require L2-pop to be enabled, in "
 "both the Agent and Server side."
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1608
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1638
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1630
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1660
 #, python-format
 msgid "Invalid tunnel type specified: %s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1633
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1663
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""
 
@@ -4798,17 +4765,11 @@ msgstr ""
 msgid "Make the l2 agent run in DVR mode."
 msgstr ""
 
-#: neutron/plugins/openvswitch/common/config.py:96
-msgid ""
-"Set new timeout in seconds for new rpc calls after agent receives "
-"SIGTERM. If value is set to 0, rpc timeout won't be changed"
-msgstr ""
-
-#: neutron/plugins/sriovnicagent/eswitch_manager.py:50
+#: neutron/plugins/sriovnicagent/eswitch_manager.py:51
 msgid "Device not found"
 msgstr ""
 
-#: neutron/plugins/sriovnicagent/eswitch_manager.py:64
+#: neutron/plugins/sriovnicagent/eswitch_manager.py:65
 msgid "Device has no virtual functions"
 msgstr ""
 
@@ -5105,7 +5066,7 @@ msgstr ""
 msgid "An interface driver must be specified"
 msgstr ""
 
-#: neutron/tests/base.py:108
+#: neutron/tests/base.py:109
 #, python-format
 msgid "Unknown attribute '%s'."
 msgstr ""
@@ -5144,12 +5105,12 @@ msgid ""
 "operation."
 msgstr ""
 
-#: neutron/tests/unit/plugins/ml2/test_plugin.py:423
+#: neutron/tests/unit/plugins/ml2/test_plugin.py:443
 #, python-format
 msgid "Deleting port %s"
 msgstr ""
 
-#: neutron/tests/unit/plugins/ml2/test_plugin.py:424
+#: neutron/tests/unit/plugins/ml2/test_plugin.py:444
 #, python-format
 msgid "The port '%s' was deleted"
 msgstr ""
@@ -5183,8 +5144,8 @@ msgstr ""
 msgid "Adds test attributes to core resources."
 msgstr ""
 
-#: neutron/tests/unit/plugins/openvswitch/agent/test_ovs_neutron_agent.py:881
-#: neutron/tests/unit/plugins/openvswitch/agent/test_ovs_neutron_agent.py:898
+#: neutron/tests/unit/plugins/openvswitch/agent/test_ovs_neutron_agent.py:893
+#: neutron/tests/unit/plugins/openvswitch/agent/test_ovs_neutron_agent.py:910
 #, python-format
 msgid "Failed to set-up %(type)s tunnel port to %(ip)s"
 msgstr ""
diff --git a/neutron/locale/pt_BR/LC_MESSAGES/neutron-log-info.po b/neutron/locale/pt_BR/LC_MESSAGES/neutron-log-info.po
index 81e426efea8..c9334cb8360 100644
--- a/neutron/locale/pt_BR/LC_MESSAGES/neutron-log-info.po
+++ b/neutron/locale/pt_BR/LC_MESSAGES/neutron-log-info.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-05-29 06:16+0000\n"
-"PO-Revision-Date: 2015-05-28 20:54+0000\n"
+"POT-Creation-Date: 2015-06-11 06:02+0000\n"
+"PO-Revision-Date: 2015-06-10 23:52+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "neutron/language/pt_BR/)\n"
@@ -185,13 +185,6 @@ msgstr "Inicializando o Extension Manager."
 msgid "Initializing mechanism driver '%s'"
 msgstr "Inicializando driver de mecanismo '%s'"
 
-#, python-format
-msgid ""
-"Inserting policy:%(new_policy)s in place of deprecated policy:%(old_policy)s"
-msgstr ""
-"Inserindo política: %(new_policy)s no lugar de política deprecada: "
-"%(old_policy)s"
-
 #, python-format
 msgid "Interface mappings: %s"
 msgstr "Mapeamentos da interface: %s"
diff --git a/neutron/locale/zh_CN/LC_MESSAGES/neutron-log-info.po b/neutron/locale/zh_CN/LC_MESSAGES/neutron-log-info.po
index 9d896ed214e..f85f32f3d16 100644
--- a/neutron/locale/zh_CN/LC_MESSAGES/neutron-log-info.po
+++ b/neutron/locale/zh_CN/LC_MESSAGES/neutron-log-info.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-05-29 06:16+0000\n"
-"PO-Revision-Date: 2015-05-28 20:54+0000\n"
+"POT-Creation-Date: 2015-06-11 06:02+0000\n"
+"PO-Revision-Date: 2015-06-10 23:52+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/neutron/"
 "language/zh_CN/)\n"
@@ -209,11 +209,6 @@ msgstr "初始化扩展驱动 '%s'"
 msgid "Initializing extension manager."
 msgstr "正在初始化扩展管理员。"
 
-#, python-format
-msgid ""
-"Inserting policy:%(new_policy)s in place of deprecated policy:%(old_policy)s"
-msgstr "在被废弃的策略:%(old_policy)s位置上插入策略:%(new_policy)s "
-
 #, python-format
 msgid "Interface mappings: %s"
 msgstr "接口映射：%s"