Updated CHANGES.txt to reflect revert of HADOOP 10474 and 10485 from branch-2


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1596049 13f79535-47bb-0310-9956-ffa450edef68
Fix CRLFs in TestKillAMPreemptionPolicy.java

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1596058 13f79535-47bb-0310-9956-ffa450edef68