* stable-2.10
  Revision bump for 2.10.3
  Update NEWS file for 2.10.3
  Warn in UPGRADE about not tar'ing exported insts
  Fix non-running test and remove custom_nicparams rename
  Acccount for NODE_RES lock in opportunistic locking
  Fix request flooding of noded during disk sync

* stable-2.9
  Allow QA asserts to produce more messages
  Add messages about skipped QA disk template tests
  Fix list-drbd QA test
  Update installation guide wrt to DRBD version
  Update NEWS for 2.9.6
  Revision bump for 2.9.6

Conflicts:
	NEWS: Used both entries
	configure.ac: Taken 2.11 version numbers
	qa/ganeti-qa.py: Moved coloring into ReportTestSkip

Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Thomas Thrainer <thomasth@google.com>