OFA agent: use hexadecimal IP address in tunnel port name

The remote IP address is used to form the tunnel port name
With some OVS/Linux combinations there is a 15 character limit
on port names, so a name like 'gre-192.168.10.10' does not work.
This fix uses the shorter hexadecimal representation of
the IP address instead.
This problem was reported and fixed for OVS agent.

Closes-Bug: 1294474

Conflicts:
	neutron/plugins/ofagent/agent/ofa_neutron_agent.py

Change-Id: Ieab1eb8a5c430f69aff61a317cc28f23ba95ad2d
(cherry picked from commit c506ebf317e64766369c0bfa97b6af182656ac4c)
Big Switch: Catch exceptions in watchdog thread

Catch and log exceptions in the watchdog greenthread to prevent
them from stopping the periodic consistency checks.

Closes-Bug: #1330135
Change-Id: I6834c0fee0429bb72b8c61307be7bdca77f6de9b
(cherry picked from commit f89a6bd30b6f99bc39f266ae8d3880380379f8b9)
Big Switch: Add missing data to topology sync

Adds data to the topology sync function that was
missing in the case where it is called from the
ML2 driver.

Closes-Bug: #1328222
Change-Id: I1cc3b0430f63f62c881f28139d1e5ebf22766357
(cherry picked from commit 2d9488be71244cd7fcee624764b2f6c0cc5fe3a1)
remove token from notifier middleware

oslo-incubator sync to address the security bug
in middleware (as below).

notifier middleware is capturing token and sending it to MQ. this
is not advisable so we should filter it out.

Change-Id: Ia1bfa1bd24989681db1d2f385defc12e69a01f8d
Closes-Bug: #1321080
ovs-agent: Ensure integration bridge is created

ovs-agent will fail to launch if integration bridge(br-int by default) is not
existed. To fix this, the agent should check and create the bridge if necessary
during launching.

Cherry-picked from https://review.openstack.org/#/c/98755/

Closes-Bug: 1328076
Change-Id: Iaa6c4d766ca086deb28c8ef7310dbfdcef2c105f
Merge "remove token from notifier middleware" into stable/icehouse
Merge "ovs-agent: Ensure integration bridge is created" into stable/icehouse
Merge "Big Switch: Catch exceptions in watchdog thread" into stable/icehouse
Merge "OFA agent: use hexadecimal IP address in tunnel port name" into stable/icehouse
Merge "Big Switch: Add missing data to topology sync" into stable/icehouse
Merge branch 'stable/icehouse' of https://github.com/openstack/quantum into stable/icehouse

Conflicts:
	neutron/plugins/bigswitch/plugin.py
	neutron/tests/unit/bigswitch/test_servermanager.py