Merge "Deleting HA router with attached port causes DB inconsistencies"

diff --cc neutron/db/l3_hamode_db.py
Simple merge

diff --cc neutron/tests/unit/db/test_l3_ha_db.py
index ab293661d226f074f04d6c1c25a1779ee884e044,604f37f0017b140f0bfb7ed8e99d5ea162343790..23c26739415bfd629f4318c859af3fe921670fd1
--- 1/neutron/tests/unit/db/test_l3_ha_db.py
--- 2/neutron/tests/unit/db/test_l3_ha_db.py
+++ b/neutron/tests/unit/db/test_l3_ha_db.py
@@@ -13,8 -13,9 +13,9 @@@
  # under the License.
  
  import mock
 -from oslo.config import cfg
 +from oslo_config import cfg
  
+ from neutron.api.v2 import attributes
  from neutron.common import constants
  from neutron import context
  from neutron.db import agents_db