Distmaker fixes for 4.5
Merge pull request #3393 from monishdeb/upgrade-distmaker-fix

Distmaker fixes for 4.5