YARN-1534. Fixed failure of test TestAHSWebApp. Contributed by Shinichi Yamashita. svn merge --ignore-ancestry -c 1556751 ../YARN-321