fd050d Backport packaging changes from 2.18 cycle

Authored and Committed by tpopela 2 years ago
    Backport packaging changes from 2.18 cycle
    
        
file modified
+15 -2