HDFS-6131. Merge change r1579736 from branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1579738 13f79535-47bb-0310-9956-ffa450edef68
YARN-1570. Fixed formatting of the lines in YarnCommands.apt.vm docs source. Contributed by Akira Ajisaka.
svn merge --ignore-ancestry -c 1579797 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1579801 13f79535-47bb-0310-9956-ffa450edef68
HDFS-6038. Merge r1579814 from branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1579815 13f79535-47bb-0310-9956-ffa450edef68
YARN-1855. Made Application-history server to be optional in MiniYARNCluster and thus avoid the failure of TestRMFailover#testRMWebAppRedirect. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1579838 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1579840 13f79535-47bb-0310-9956-ffa450edef68
YARN-1859. Fixed WebAppProxyServlet to correctly handle applications absent on the ResourceManager. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1579866 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1579868 13f79535-47bb-0310-9956-ffa450edef68
YARN-1811. Fixed AMFilters in YARN to correctly accept requests from either web-app proxy or the RMs when HA is enabled. Contributed by Robert Kanter.
svn merge --ignore-ancestry -c 1579877 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1579879 13f79535-47bb-0310-9956-ffa450edef68
YARN-1670. Fixed a bug in log-aggregation that can cause the writer to write more log-data than the log-length that it records. Contributed by Mit Desai.
svn merge --ignore-ancestry -c 1580005 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1580007 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1580013 from trunk for HDFS-6138. Add a user guide for how to use viewfs with federation.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1580019 13f79535-47bb-0310-9956-ffa450edef68
HDFS-6120. Merging r1580048 from branch-2 to branch-2.4.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1580049 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5787. Added the ability to keep alive shuffle connections in the MapReduce shuffle-handler. Contributed by Rajesh Balamohan.
svn merge --ignore-ancestry -c 1580062 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1580064 13f79535-47bb-0310-9956-ffa450edef68
Merge r1580078 from branch-2. YARN-1849. Fixed NPE in ResourceTrackerService#registerNodeManager for UAM. Contributed by Karthik Kambatla

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1580081 13f79535-47bb-0310-9956-ffa450edef68
YARN-1775. Enhanced ProcfsBasedProcessTree to optionally add the ability to use smaps for obtaining used memory information. Contributed by Rajesh Balamohan.
svn merge --ignore-ancestry -c 1580087 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1580089 13f79535-47bb-0310-9956-ffa450edef68
YARN-1863. Fixed test failure in TestRMFailover after YARN-1859. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1580094 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1580096 13f79535-47bb-0310-9956-ffa450edef68
YARN-1854. Fixed test failure in TestRMHA#testStartAndTransitions. Contributed by Rohith Sharma KS.
svn merge --ignore-ancestry -c 1580097 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1580099 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5806. Fixed a bug in MRAppMaster so as to enable users to properly override HADOOP_ROOT_LOGGER or HADOOP_CLIENT_OPTS. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1580100 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1580102 13f79535-47bb-0310-9956-ffa450edef68
YARN-1536. Cleanup: Get rid of ResourceManager#get*SecretManager() methods and use the RMContext methods instead. (Anubhav Dhoot via kasha)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1580130 13f79535-47bb-0310-9956-ffa450edef68
Merge r1580156 from branch-2. YARN-1776. Fixed DelegationToken renewal to survive RM failover. Contributed by Zhijie Shen

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1580157 13f79535-47bb-0310-9956-ffa450edef68
YARN-1577. Made UnmanagedAMLauncher do launchAM after the attempt reaches the LAUNCHED state. Contributed by Jian He.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1580167 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-10191. Merging change r1580171 from branch-2 to branch-2.4

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1580172 13f79535-47bb-0310-9956-ffa450edef68
HDFS-6140. Merging change r1580174 from branch-2 to branch-2.4

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