TEZ-1405. TestSecureShuffle is slow (Rajesh Balamohan via bikas)
Merge remote-tracking branch 'origin/master' into test