HDFS-5661. Merge change r1552177 from trunk.

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