HDFS-4785. Merge change r1478267 from trunk

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