Merge "Default to setting secure mode on the integration bridge"

diff --cc neutron/agent/linux/ovs_lib.py
Simple merge

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

diff --cc neutron/tests/unit/agent/linux/test_ovs_lib.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