04107ec Mior sync with rhel7

Authored and Committed by jvanek 8 years ago
    Mior sync with rhel7
    
        
file modified
+15 -6