HDFS-5078. Merging change r1518813 from branch-2

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1518816 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5441. Changed MR AM to return RUNNING state if exiting when RM commands to reboot, so that client can continue to track the overall job. Contributed by Jian He.
svn merge --ignore-ancestry -c 1518821 ../../trunk/


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