YARN-1357. TestContainerLaunch.testContainerEnvVariables fails on Windows. Contributed by Chuan Liu.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1537293 13f79535-47bb-0310-9956-ffa450edef68
YARN-1358. TestYarnCLI fails on Windows due to line endings. Contributed by Chuan Liu.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1537305 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5065. Change attribution in CHANGES.txt to version 2.2.1.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1537319 13f79535-47bb-0310-9956-ffa450edef68
YARN-1321. Changed NMTokenCache to support both singleton and an instance usage. Contributed by Alejandro Abdelnur.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1537334 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd
Merge remote branch 'origin/trunk-gd' into fb-YAHOO-214-trunk-gd