Fix up a little test failure.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1494787 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5334. Fix failing unit tests - TestContainerLauncher, TestContainerLauncherImpl. Contributed by Vinod Kumar Vavilapalli.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1494820 13f79535-47bb-0310-9956-ffa450edef68
Move HADOOP-8608 to branch-2.1

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