e370ba8 merge epel7; address conflicts

Merged and Committed by jogas 2 years ago
    merge epel7; address conflicts
    
        
file modified
+49 -64