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


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/YARN-321@1556751 13f79535-47bb-0310-9956-ffa450edef68