fixes
Merge branch 'build-fixes' of https://github.com/dnanexus/dx-toolkit into build-fixes