BSN: Set hash header to empty instead of False

Sets the consistency hash header to empty instead
of False since 'False' is handled like a string on
the backend and requires special-casing to detect.

Conflicts:

	neutron/tests/unit/bigswitch/test_servermanager.py

Change-Id: Iee1651574c01a32e78167a9bbed4e0433abbdec2
Closes-Bug: #1325771
(cherry-picked from 7b9ed4edeef7d599c164c8682fbbb36066d98abb)
Big Switch: Call correct method in watchdog

Updates the consistency watchdog fuction to call
the correct rest method.

Closes-Bug: #1328321
Change-Id: I86ce0af36f6764a3f1e789602cef52758caedc8b
(cherry picked from commit c8bdff1533e54787d9a3dd98fe57a1e2e0d82e73)
Merge "BSN: Set hash header to empty instead of False" into stable/icehouse
Merge "Big Switch: Call correct method in watchdog" into stable/icehouse
Merge branch 'stable/icehouse' of https://github.com/openstack/quantum into stable/icehouse