svn merge -c 1416064 from trunk for HDFS-4248. Renaming directories may incorrectly remove the paths in leases under the tree.