svn merge -c 1492941 from trunk for HDFS-4845. FSNamesystem.deleteInternal should acquire write-lock before changing the inode map.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492942 13f79535-47bb-0310-9956-ffa450edef68
YARN-792. Moved NodeHealthStatus from yarn.api.record to yarn.server.api.record. Contributed by Jian He.
svn merge --ignore-ancestry -c 1492943 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492944 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-253-branch-2-gd