5105b60614
Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java (cherry picked from commit 60d82ac61f2afa2a61c8eeabf20e45b5a89311d0)