[PTFM-7930] More changes to dxcpp tests
Merge branch 'master' of github.com:dnanexus/dx-toolkit