YARN-2843. Merging to branch-2.6 for hadoop-2.6.0-rc1.

(cherry picked from commit 51957ca81886ac3553c44848631fdf53766a25ae)

Conflicts:
	hadoop-yarn-project/CHANGES.txt

hadoop-yarn-project/CHANGES.txt

@@ -862,6 +862,9 @@ Release 2.6.0 - 2014-11-15
 
     YARN-2841. RMProxy should retry EOFException. (Jian He via xgong)
 
+    YARN-2843. Fixed NodeLabelsManager to trim inputs for hosts and labels so
+    as to make them work correctly. (Wangda Tan via vinodkv)
+
 Release 2.5.2 - 2014-11-10
 
   INCOMPATIBLE CHANGES