MAPREDUCE-5257. Fix issues in TestContainerLauncherImpl after YARN-617. Contributed by Omkar Vinit Joshi. svn merge --ignore-ancestry -c 1484349 ../../trunk/