Merge pull request #3442 from mpg/make-coverage-script-deterministic-2.16

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