HADOOP-11170. Pulling into branch-2.6 also, fixing CHANGES.txt.

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -373,9 +373,6 @@ Release 2.7.0 - UNRELEASED
     HDFS-7227. Fix findbugs warning about NP_DEREFERENCE_OF_READLINE_VALUE in
     SpanReceiverHost (cmccabe)
 
-    HADOOP-11170. ZKDelegationTokenSecretManager fails to renewToken created by 
-    a peer. (Arun Suresh and Gregory Chanan via kasha)
-
 Release 2.6.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -1011,6 +1008,9 @@ Release 2.6.0 - UNRELEASED
     HADOOP-11228. Winutils task: unsecure path should not call
     AddNodeManagerAndUserACEsToObject. (Remus Rusanu via jianhe)
 
+    HADOOP-11170. ZKDelegationTokenSecretManager fails to renewToken created by 
+    a peer. (Arun Suresh and Gregory Chanan via kasha)
+
 Release 2.5.1 - 2014-09-05
 
   INCOMPATIBLE CHANGES