* stable-2.9
  Ganeti.Daemon: always install SIGHUP handler

* stable-2.10
  ganeti.daemon: fix daemon mode with GnuTLS >= 3.3
  Fix DRBD version check for non VM capable nodes
  Fix invalid message from gnt-os
  Renaming NV_VMNODES to NV_NONVMNODES
  Node names in NV_VMNODES

* stable-2.11
  Remove misleading cleanup
  systemd: start kvmd by default
  Fix failing BGL whitelist test
  Remove BGL from LUInstanceRename
  Factor out instance existence checks
  Allow coexistence of adding and acquiring locks
  Allow _LockList to handle locking.ALL_SET

Conflicts:
	lib/cmdlib/instance.py
	lib/cmdlib/instance_utils.py
	lib/mcpu.py
	test/py/ganeti.mcpu_unittest.py

Resolution:
	test/py/ganeti.mcpu_unittest.py and
	lib/cmdlib/instance_utils.py trivial;
	rest: take master (the only changes in
	the lower branches to those files
	where cherry-picks).

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>