(cherry picked from commit 964e546ab1dba5f5d53b209ec6c9a70a85654765) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockTokenWithDFSStriped.java (cherry picked from commit 1b91ebb7145860ecda394d764da5fc7063406fee)