HDFS-4651. Merge changes 1462875 and 1462876 from branch-1

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.2@1462877 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4651. Adding missed CHANGES.txt in the previous commit.

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