ef1a2b478b
(cherry picked from commit c2ff39006f5deca60a2a2524707350e06bba2779) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java