[MERGE] stable-2.15 to stable 2.16

['Brian Foley' via ganeti-devel]

commit 5785f214a9e728465a4bfc1aef7ded306225cfa2
Merge: 40cd52f 2429235
Author: Brian Foley <bpfo...@google.com>
Date:   Fri Jun 10 14:23:10 2016 +0100

    Merge branch 'stable-2.15' into stable-2.16
    
    * stable-2.15
      Fixup compatibility with GHC 7.4/base 4.5
    
    Signed-off-by: Brian Foley <bpfo...@google.com>