Merge pull request #3443 from mpg/make-coverage-script-deterministic-2.7

[Backport 2.7] Make basic-build-test.sh more deterministic