HDFS-5804. Merge change r1563323 from trunk.

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