(cherry picked from commit 2da03b48eba53d4dec2a77209ad9835d808171d1) (cherry picked from commit 60d3a3c30b05fdeec5cc369a698297ee309d620e) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
(cherry picked from commit 2da03b48eba53d4dec2a77209ad9835d808171d1) (cherry picked from commit 60d3a3c30b05fdeec5cc369a698297ee309d620e) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java