HADOOP-10399. Merging change r1576126 from branch-2 to branch-2.4

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1576129 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1576128 from branch-2 for HDFS-5535.


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