(cherry picked from commit b63dcd583f0b98e785831004f41bd7c7de8b3c18) (cherry picked from commit 75be15cf021e31d167570b3038060ddce62e2120) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EncryptionFaultInjector.java