[MERGE] stable-2.17 to master

['Viktor Bachraty' via ganeti-devel]

commit 2cfaa3420a6bd4e51d0adaf117bc497fab0e9add
Merge: 3b5ac4e b9de363
Author: Viktor Bachraty <vbachr...@google.com>
Date:   Fri Apr 22 15:20:33 2016 +0100

    Merge branch 'stable-2.17'
    
    * stable-2.16
      Make debug http server more verbose
      Reduce load in NV_NODENETTEST and NV_MASTERIP
      Re-fix local port/ip logging in HttpClientRequest
    
    * stable-2.15
      Allow newer cabal deps for latest Debian/Ubuntu