svn merge -c 1460808 FIXES: YARN-71. 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-0.23@1469686 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/branch-0.23' into branch-0.23-gd
Merge remote branch 'origin/branch-0.23-gd' into fb-YAHOO-275-branch-0.23-gd