[v18.x backport] backport recent fixes to flaky tests

Can't show this merge request because the source branch github/fork/joyeecheung/backport-test-fixes is missing from project rodrigo-test/test-group-nodejs/node. Close this merge request or update the source branch.