YARN-1070. Fixed race conditions in NodeManager during container-kill. Contributed by Zhijie Shen. svn merge --ignore-ancestry -c 1527827 ../../trunk/