Merge "Ignore PortNotFound exceptions on lockless delete"

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

diff --cc neutron/tests/unit/cisco/test_network_plugin.py
Simple merge

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