Merge -r 1150859:1150860 from branch-0.20-security onto branch-0.20-security-204

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

CHANGES.txt

@@ -1,8 +1,5 @@
 Hadoop Change Log
 
-    MAPREDUCE-2621. TestCapacityScheduler fails with "Queue "q1" does not exist".
-    (Sherry Chen via mahadev)
-
 Release 0.20.204.0 - unreleased
 
   NEW FEATURES
@@ -16,6 +13,9 @@ Release 0.20.204.0 - unreleased
 
   BUG FIXES
 
+    MAPREDUCE-2621. TestCapacityScheduler fails with "Queue "q1" does not exist".
+    (Sherry Chen via mahadev)
+
     HADOOP-7475. Fix hadoop-setup-single-node.sh to reflect new layout. (eyang
     via omalley)