YARN-2319. Made the MiniKdc instance start/close before/after the class of TestRMWebServicesDelegationTokens. Contributed by Wenwu Peng.
svn merge --ignore-ancestry -c 1612588 ../../trunk/


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

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612610 13f79535-47bb-0310-9956-ffa450edef68
HDFS-6704. Merge r1612613 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612615 13f79535-47bb-0310-9956-ffa450edef68
HDFS-6701. Make seed optional in NetworkTopology#sortByDistance. Contributed by Ashwin Shankar.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612627 13f79535-47bb-0310-9956-ffa450edef68
Merge r1612626 from trunk. YARN-2295. Refactored DistributedShell to use public APIs of protocol records. Contributed by Li Lu

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612629 13f79535-47bb-0310-9956-ffa450edef68
YARN-2131. Addendum2: Document -format-state-store. Add a way to format the RMStateStore. (Robert Kanter via kasha)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612635 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1612652 FIXES: MAPREDUCE-5963. ShuffleHandler DB schema should be versioned with compatible/incompatible changes. Contributed by Junping Du


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612654 13f79535-47bb-0310-9956-ffa450edef68
HDFS-6712: Merging r1612695 from trunk to branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612696 13f79535-47bb-0310-9956-ffa450edef68
HDFS-6703. Merging change r1612702 from trunk

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