97cbbcc Add upstream patches to fix 2 scenario failures

Authored and Committed by xavierb 4 years ago
    Add upstream patches to fix 2 scenario failures
    
        
file modified
+8 -1