[MERGE] stable-2.216 to stable-2.17

['Brian Foley' via ganeti-devel]

commit 912e0a2bda0456dd3e2fbfc97bfed78827e89a4e
Merge: f80d6ed 6b183e5
Author: Brian Foley <bpfo...@google.com>
Date:   Mon Aug 22 12:17:21 2016 +0100

    Merge branch 'stable-2.16' into stable-2.17
    
    * stable-2.16
      Fix inconsistent spaces vs tabs indent in makefile
    
    * stable-2.13
      Bugfix: migrate needs HypervisorClass, not an instance
    
    Signed-off-by: Brian Foley <bpfo...@google.com>