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