HDFS-6712: Merging r1612696 from branch-2 to branch-2.5.

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