* stable-2.11
  Add missing import
  Fix INicParams to include inicNetwork
  Improve KVM userspace access documentation

* stable-2.10
  Add --no-locks option to gnt-debug dela
  Include design-performance-tests.rst in index
  Document the --force-failover option
  Support group evacuation by failover
  Add an option --force-failover
  Extend OpGroupEvacuate by a ForceFailover paramter
  Mark performance tests design as implemented
  openvswitch fix
  Document the --sequential option
  Support sequential evacuation
  Add an option --sequential
  Extend OpGroupEvacuate by a sequential paramter

* stable-2.9
  Improve haskell style
  check-man-warnings: use C.UTF-8 and set LC_ALL
  Fix passing of ispecs in cluster init during QA

Conflicts:
	doc/design-draft.rst
	lib/client/gnt_debug.py
	lib/cmdlib/test.py
	src/Ganeti/HTools/Program/Harep.hs
	src/Ganeti/HTools/Program/Hspace.hs
	src/Ganeti/JQueue.hs
	src/Ganeti/OpCodes.hs
	src/Ganeti/OpParams.hs
	test/hs/Test/Ganeti/HTools/Instance.hs
Resolution:
	lib/cmdlib/test.py: modify/remove resolved
	  in favor of the remove on stable-2.12
	*/HTools/* and src/Ganeti/Op*: add both new
	  parameters to the delay opcode
	rest: trivial union

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