[MERGE] Merge branch 'stable-2.11' into stable-2.12

['Thomas Thrainer' via ganeti-devel]

commit 50c4c6b2eeb7b4f7f20d5bd529c0cafabc9ef256
Merge: 4604976 3b86a50
Author: Thomas Thrainer <thoma...@google.com>
Date:   Mon May 12 14:12:48 2014 +0200

    Merge branch 'stable-2.11' into stable-2.12
    
    * stable-2.10
      Fix passing of ispecs in cluster init during QA
      Move QAThreadGroup to qa_job_utils.py
      Extract GetJobStatuses and use an unified version
      Run disk template specific tests only if possible
    
    Signed-off-by: Thomas Thrainer <thoma...@google.com>