MAPREDUCE-5687. Fixed failure in TestYARNRunner caused by YARN-1446. Contributed by Jian He. svn merge --ignore-ancestry -c 1551774 ../../trunk/