HDFS-4544. Error in deleting blocks should not do check disk, for all types of errors. Contributed by Arpit Agarwal.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1453670 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9375. Port HADOOP-7290 to branch-1 to fix TestUserGroupInformation failure. Contributed by Xiaobo Peng.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1453673 13f79535-47bb-0310-9956-ffa450edef68