YARN-688. Fixed NodeManager to properly cleanup containers when it is shut down. Contributed by Jian He. svn merge --ignore-ancestry -c 1506814 ../../trunk/