svn merge -c 1367296 FIXES: HADOOP-8635. Cannot cancel paths registered deleteOnExit (daryn via bobby)