HADOOP-9429. TestConfiguration fails with IBM JAVA. Contributed by Amir Sanjar.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1464725 13f79535-47bb-0310-9956-ffa450edef68
Updated CHANGES.txt to reflect YARN-470 being merged into branch-2.0.4-alpha.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1464772 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4625. Make TestNNWithQJM#testNewNamenodeTakesOverWriter work on Windows. Contributed by Ivan Mitic.

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