needs CI, Jenkins is however going down at the moment

Note this actually backports two separate PR's. It was easier like this...

CI: https://ci.nodejs.org/job/node-test-pull-request/29682/

@ronag generally for backports we want to, as much as possible, keep the original commit meta data in place. In this case we have 3 commits that have now been merged into a single commit. Would it be a ton of extra work to retain that original structure? It makes it harder, at least for me, to review and compare the specific changes to see what the differences are... and almost requires full review now as it is a compeltely different patch then anything that we've landed

@MylesBorins in this specific case it’s a bit harder. Since a commit both of these depend on seems to be missing. I can try again...