Pulling in YARN-3535 to branch 2.7.x

(cherry picked from commit 176131f12bc0d467e9caaa6a94b4ba96e09a4539)

hadoop-yarn-project/CHANGES.txt

@@ -598,9 +598,6 @@ Release 2.8.0 - UNRELEASED
     YARN-3885. ProportionalCapacityPreemptionPolicy doesn't preempt if queue is 
     more than 2 level. (Ajith S via wangda)
 
-    YARN-3535. Scheduler must re-request container resources when RMContainer transitions
-    from ALLOCATED to KILLED (rohithsharma and peng.zhang via asuresh)
-
 Release 2.7.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -627,6 +624,9 @@ Release 2.7.2 - UNRELEASED
     YARN-3905. Application History Server UI NPEs when accessing apps run after
     RM restart (Eric Payne via jeagles)
 
+    YARN-3535. Scheduler must re-request container resources when RMContainer transitions
+    from ALLOCATED to KILLED (rohithsharma and peng.zhang via asuresh)
+
 Release 2.7.1 - 2015-07-06 
 
   INCOMPATIBLE CHANGES