Merge "Raise error upon deleting subnet with router ports"

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

diff --cc neutron/plugins/ml2/plugin.py
Simple merge

diff --cc neutron/tests/unit/test_db_plugin.py
Simple merge

diff --cc neutron/tests/unit/test_l3_plugin.py
Simple merge