HDFS-6868. Merging change r1619001 from trunk

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