Fix up a little test failure.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1494790 13f79535-47bb-0310-9956-ffa450edef68
merge MAPREDUCE-5334 from branch-2. 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.1-beta@1494822 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.1-beta@1494826 13f79535-47bb-0310-9956-ffa450edef68