YARN-2388. Fixed TestTimelineWebServices failure due to HADOOP-10791. Contributed by Zhijie Shen. svn merge --ignore-ancestry -c 1616405 ../../trunk/