HADOOP-11333. Fix deadlock in DomainSocketWatcher when the notification pipe is full (zhaoyunjiong via cmccabe)

Moved to 2.6.1

(cherry picked from commit 05ed69058f22ebeccc58faf0be491c269e950526)

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

(cherry picked from commit 796b94df1ea0269617417bb7889ed4035ed0f5a2)

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

@@ -441,9 +441,6 @@ Release 2.7.0 - 2015-04-20
     HADOOP-11257. Update "hadoop jar" documentation to warn against using it
     for launching yarn jars (iwasakims via cmccabe)
 
-    HADOOP-11333. Fix deadlock in DomainSocketWatcher when the notification
-    pipe is full (zhaoyunjiong via cmccabe)
-
     HADOOP-11337. KeyAuthorizationKeyProvider access checks need to be done
     atomically. (Dian Fu via wang)
 
@@ -835,6 +832,9 @@ Release 2.6.1 - UNRELEASED
 
     HADOOP-10786. Fix UGI#reloginFromKeytab on Java 8. (Stephen Chu via wheat9)
 
+    HADOOP-11333. Fix deadlock in DomainSocketWatcher when the notification
+    pipe is full (zhaoyunjiong via cmccabe)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES