MAPREDUCE-4202. Updating changes to just be branch-2

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

hadoop-mapreduce-project/CHANGES.txt

@@ -269,6 +269,9 @@ Release 2.0.0 - UNRELEASED
     MAPREDUCE-4193. broken doc link for yarn-default.xml in site.xml.
     (phunt via tomwhite)
 
+    MAPREDUCE-4202. TestYarnClientProtocolProvider is broken (Daryn Sharp via
+    bobby)
+
 Release 0.23.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -436,9 +439,6 @@ Release 0.23.3 - UNRELEASED
     MAPREDUCE-4211. Error conditions (missing appid, appid not found) are 
     masked in the RM app page (Jonathan Eagles via bobby)
 
-    MAPREDUCE-4202. TestYarnClientProtocolProvider is broken (Daryn Sharp via
-    bobby)
-
 Release 0.23.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES