Signed-off-by: Akira Ajisaka <aajisaka@apache.org> (cherry picked from commit ba325a8ada573291266c4d6447862072fdf88af5) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenSecretManager.java
Signed-off-by: Akira Ajisaka <aajisaka@apache.org> (cherry picked from commit ba325a8ada573291266c4d6447862072fdf88af5) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenSecretManager.java