HDFS-5283. Merge change r1532858 and r1532861 from branch-2.

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