HDFS-6851. Refactor EncryptionZoneWithId and EncryptionZone. (clamb via wang)