HDFS-5956. Merge change r151573081rom t branch-2.

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