svn merge -c 1509401 FIXES: MAPREDUCE-5428.  HistoryFileManager doesn't stop threads when service is stopped. Contributed by Karthik Kambatla


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509404 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9801. Merging change r1509405 from trunk to branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509408 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9806. Merging r1509347 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509427 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/branch-2' into branch-2-gd