ec928ec backport change from upstream to fix reported test failures (bz1795896)

Authored and Committed by spot 4 years ago
    backport change from upstream to fix reported test failures (bz1795896)
    
        
file modified
+10 -2