(cherry picked from commit 356ebbbe80aef991d564a6140e341ddd76176416) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java Change-Id: If76fd0d77fafc90fe2f2c19ab1d0c43a58510f6b Co-authored-by: bshashikant <shashikant@apache.org> (cherry picked from commit 5333e872e2a07de8ff2431c9ff041bb582e8e173)