Backport test abort on timeout to v6.x#11354

misterdjules wants to merge 2 commits intonodejs:v6.x-stagingnodejs/node:v6.x-stagingfrom

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