Merge "Break coupling between ML2 and L3 during create/update operations"

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

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

diff --cc neutron/tests/unit/ml2/test_ml2_plugin.py
Simple merge

diff --cc neutron/tests/unit/ml2/test_rpcapi.py
Simple merge