YARN-906. Fixed a bug in NodeManager where cancelling ContainerLaunch at KILLING state causes that the container to hang. Contributed by Zhijie Shen. svn merge --ignore-ancestry -c 1509924 ../../trunk/