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

['Thomas Thrainer' via ganeti-devel]

commit 365662b730e360056ff75490e8e05fbf12237e6b
Merge: 22b6496 a37549e
Author: Thomas Thrainer <thoma...@google.com>
Date:   Thu May 22 12:47:00 2014 +0200

    Merge branch 'stable-2.10' into stable-2.11
    
    * stable-2.10
      tiered allocation: try canonical search path first
      Add QA config flag for all performance tests
      build-bash-completion: reduce branches
      Convert all the classes to new-style classes
    
    Signed-off-by: Thomas Thrainer <thoma...@google.com>