YARN-2081. Fixed TestDistributedShell failure after YARN-1962. Contributed by Zhiguo Hong. svn merge --ignore-ancestry -c 1596724 ../../trunk/