YARN-661. Fixed NM to cleanup users' local directories correctly when starting up. Contributed by Omkar Vinit Joshi. svn merge --ignore-ancestry -c 1503942 ../../trunk/