* stable-2.10
  Remove FIXME + update man pages wrt iallocator
  Don't check for master netdev when using OVS
  Fix TypeError in backend/ConfigureOVS
  Create Open vSwitch on Master during Cluster init
  SimpleRetry on BlockDev.Remove()
  Show the key in "'None' is not a valid Maybe value"
  Fix usage of xm/xl for gnt-instance modify --new-primary
  Hs2Py constants (17 patches)
  Fix default value for reason trail
  Hotplug (23 patches)

* stable-2.8
  Add all dependencies for confd as test dependencies
  Add snap-server to the test-relevant packages
  Placate warnings on ganeti.outils_unittest.py

Conflicts:
	lib/cmdlib/instance.py: trivial
	src/Ganeti/Types.hs: use both additions
	test/py/cmdlib/instance_unittest.py: manually
            appply ff5def9b

 to version of master

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Michele Tartara <mtartara@google.com>