YARN-1595. Made enabling history service configurable and fixed test failures on branch YARN-321. Contributed by Vinod Kumar Vavilapalli. svn merge --ignore-ancestry -c 1559001 ../YARN-321