HDFS-6614. Merging change r1608847 from branch-2 to branch-2.5.

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