Merge "ML2: Driver API changes for hierarchical port binding"

diff --cc neutron/plugins/ml2/drivers/cisco/apic/mechanism_apic.py
Simple merge

diff --cc neutron/plugins/ml2/drivers/mech_agent.py
Simple merge

diff --cc neutron/plugins/ml2/drivers/mech_bigswitch/driver.py
Simple merge

diff --cc neutron/plugins/ml2/drivers/mechanism_odl.py
Simple merge

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_rpcapi.py
Simple merge