5f6b768 Synchronizing patches from CentOS

Authored and Committed by dbelyavs a month ago
    Synchronizing patches from CentOS
    
        
file modified
+41 -25
file modified
+19 -8
file modified
+9 -10