[MERGE] stable-2.17 to master

['Brian Foley' via ganeti-devel]

commit 310c43061f6fdac2e5c10fea1466066fd4e0655e
Merge: aa50df9 3be37ca
Author: Brian Foley <bpfo...@google.com>
Date:   Mon Aug 22 12:23:36 2016 +0100

    Merge branch 'stable-2.17'
    
    * stable-2.17
      Fix hlint warnings
    
    * stable-2.16
      Fix inconsistent spaces vs tabs indent in makefile
      Fix some typos/poor phrasing in gnt-node man page
      Add missing cluster modify --modify-etc-hosts to man
      Fix/quell hlint warnings
    
    * stable-2.13
      Bugfix: migrate needs HypervisorClass, not an instance
    
    Signed-off-by: Brian Foley <bpfo...@google.com>