svn merge -c 1552711 merging from trunk to branch-2 to fix HDFS-5681. renewLease should not hold fsn write lock.