[MERGE] stable-2.16 to stable-2.17

['Viktor Bachraty' via ganeti-devel]

commit 2f37deebd9be468336cb52e5db098e0a98f12a51
Merge: 461c9c8 eb3f956
Author: Viktor Bachraty <vbachr...@google.com>
Date:   Fri Apr 22 15:01:51 2016 +0100

    Merge branch 'stable-2.16' into 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
    
    Manually fixup merge conflicts.
    
    Signed-off-by: Viktor Bachraty <vbachr...@google.com>