reverting r1459588. HDFS-4615.


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


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460795 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9408. Merge change r1457015 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460800 13f79535-47bb-0310-9956-ffa450edef68
merge YARN-71 from trunk. Fix the NodeManager to clean up local-dirs on restart. Contributed by Xuan Gong.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460809 13f79535-47bb-0310-9956-ffa450edef68
merge YARN-439 from trunk. Flatten NodeHeartbeatResponse. Contributed by Xuan Gong.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460812 13f79535-47bb-0310-9956-ffa450edef68
merge -c r1460846 from trunk to branch-2 for YARN-497. Yarn unmanaged-am launcher jar does not define a main class in its manifest (Hitesh Shah via bikas)

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