bf6ee26 Adjust patches to 9.11.12

Authored and Committed by pemensik 4 years ago
    Adjust patches to 9.11.12
    
    Few changes occured, remove one upstream applied patch.
    
        
file modified
+55 -55
file modified
+86 -65
file modified
+0 -3