(cherry picked from commit 2c6cfad5a31ca4d9126ecd2b3c43cca8543aacb4) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirEncryptionZoneOp.java
(cherry picked from commit 2c6cfad5a31ca4d9126ecd2b3c43cca8543aacb4) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirEncryptionZoneOp.java