HDFS-4633. Merging change r1461846 and r1537345 from trunk to branch-2.

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