HDFS-6703. Merging change r1612705 from branch-2

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