a98017d Rebase to latest upstream version

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