[MERGE] stable-2.15 to stable-2.16

['Brian Foley' via ganeti-devel]

commit 2dc71a7814258445b2a8de49747aebc282642343
Merge: 90281b4 d27c6da
Author: Brian Foley <bpfo...@google.com>
Date:   Tue Jun 14 12:28:28 2016 +0100

    Merge branch 'stable-2.15' into stable-2.16
    
    Manually resolve conflicts.
    
    Signed-off-by: Brian Foley <bpfo...@google.com>