(cherry picked from commit a9331fe9b071fdcdae0c6c747d7b6b306142e671) (cherry picked from commit ec2621e907742aad0264c5f533783f0f18565880) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java (cherry picked from commit d79a5849999cdb0bc315938b80ed71b4f2dcb720)