YARN-1555. Fixed test failures in applicationhistoryservice.* (Vinod Kumar Vavilapalli via mayank)
svn merge --ignore-ancestry -c 1555274 ../../branches/YARN-321-old/


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