Merge branch 'stable-2.11' into master

[Hrvoje Ribicic]

commit b1dc6a7e0cba5d1492256f67d04a50de851c71bd
Merge: 3cb014b 7ddbfba
Author: Hrvoje Ribicic <r...@google.com>
Date:   Thu Apr 10 12:51:57 2014 +0000

    Merge branch 'stable-2.11' into master

    * stable-2.11
      (no changes)

    * 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:
    qa/qa_utils.py: Taken more generic 2.10 functions

    Signed-off-by: Hrvoje Ribicic <r...@google.com>