svn merge -c 1547393 merging from trunk to branch-2 to fix: HDFS-5558. LeaseManager monitor thread can crash if the last block is complete but another block is not.