HDFS-5291. Merge change r1530113 from branch-2.

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