Merge "ovs-agent: Ensure integration bridge is created"

diff --cc neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
Simple merge

diff --cc neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py
Simple merge

diff --cc neutron/tests/unit/openvswitch/test_ovs_tunnel.py
Simple merge