Reduce disk usage during dist
Merge pull request #4779 from guardian/dist-disk-usage

Reduce disk usage during dist