HADOOP-10547: Merging r1591098 from trunk to branch-2.

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

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

@@ -99,6 +99,9 @@ Release 2.5.0 - UNRELEASED
     HADOOP-10508. RefreshCallQueue fails when authorization is enabled.
     (Chris Li via wheat9)
 
+    HADOOP-10547. Give SaslPropertiesResolver.getDefaultProperties() public
+    scope. (Benoy Antony via Arpit Agarwal)
+
 Release 2.4.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -165,9 +165,6 @@ Release 2.5.0 - UNRELEASED
 
     HDFS-5892. TestDeleteBlockPool fails in branch-2. (Ted Yu via wheat9)
 
-    HADOOP-10547. Give SaslPropertiesResolver.getDefaultProperties() public
-    scope. (Benoy Antony via Arpit Agarwal)
-
 Release 2.4.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES