Backport test abort on timeout to v4.x#11351

misterdjules wants to merge 2 commits into

nodejs:v4.x-stagingnodejs/node:v4.x-stagingfrom

misterdjules:backport-test-abort-on-timeout-to-v4.xmisterdjules/node-1:backport-test-abort-on-timeout-to-v4.xCopy head branch name to clipboard