* stable-2.12
  Make WConfD's updateLocksWaiting safe
  Tests specifying safeUpdateLocksWaiting
  Provide a repeatable version of updateLocksWaiting
  Verify that updateLocks is idempotent
  Always accept no-op requests
  Allow unconditional failovers off offline nodes
  Remove now unused variable
  Fix bug in ssconf comparison, disable it for vcluster
  QA: test renewing the cluster certificate only
  QA: Assert equality of ssconf_master_candidate_certs
  QA: Add more verify steps in renew crypto QA

* stable-2.11
  (no changes)

* stable-2.10
  Substitute 'suffix' for 'revision'

Conflicts:
	qa/qa_cluster.py
	src/Ganeti/HTools/Cluster.hs
	src/Ganeti/HTools/Node.hs
(All trivial by taking the union of the changes.)

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>