fadab11 Merge recent updates from RHEL.

Authored and Committed by pcahyna 5 years ago
    Merge recent updates from RHEL.
    
        
file modified
+21 -16