Fix up a little test failure.


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


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494821 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-8608. Add Configuration API for parsing time durations.

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