e33c6d6 Rebase to latest upstream version

Authored and Committed by rdossant 4 years ago
    Rebase to latest upstream version
    
    - Resolves #1758417
    
    Signed-off-by: Rafael dos Santos <rdossant@redhat.com>
    
        
file modified
+1 -0
file modified
+11 -14
file modified
+1 -3