6656dd9 Rebase to latest upstream master branch

Authored and Committed by honli 7 years ago
    Rebase to latest upstream master branch
    
    Fix build failures caught by gcc 7.x.
    Resolves: bz1423872
    
    Signed-off-by: Honggang Li <honli@redhat.com>
    
        
file modified
+1 -0
file modified
+8 -3
file modified
+1 -1