MAPREDUCE-3519. Fixed a deadlock in NodeManager LocalDirectories's handling service. Contributed by Ravi Gummadi. svn merge -c 1212680 --ignore-ancestry ../../trunk