MAPREDUCE-5015. Coverage fix for org.apache.hadoop.mapreduce.tools.CLI (Aleksey Gorshkov via tgraves)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1468483 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4699: add exceptions related to SocketChannel to checkDiskError
Merge branch 'trunk' into HDFS-4699
HDFS-4699: trying to go back to 30 second lease poll
HDFS-4699: back to 60s timeout on lease poll
HDFS-4699: keep change to cap failover sleep time at 1s
HDFS-4699: shorten connection reset check