* stable-2.10
  Fix failed DRBD disk creation cleanup
  Fix lint errors introduced during cherry-pick
  Hooking up verification for shared file storage
  Fix --shared-file-storage-dir option of gnt-cluster modify
  Clarify default setting of 'metavg'
  Fix invocation of GetCommandOutput in QA
  Clean up RunWithLocks
  Add an exception-trapping thread class
  Wait for delay to provide interruption information
  Add an expected block option to RunWithLocks
  Track if a QA test was blocked by locks
  Add a RunWithLocks QA utility function

* stable-2.9
  If Automake version > 1.11, force serial tests

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