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.1-beta@1509407 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9801. Merging change r1509408 from branch-2 to branch-2.1-beta.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1509412 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4962. Merging r1509386 from branch-2

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1509453 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9801. Move to correct 2.1.1-beta section of CHANGES.txt

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

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1509461 13f79535-47bb-0310-9956-ffa450edef68