9902b68 forward port packaging changes from 8.4 branch

Authored and Committed by petersen 5 years ago
    forward port packaging changes from 8.4 branch
    
        
file modified
+93 -31