Ensure that when un-encrpyting a property the indicator is removed from

security.conf

src/java/org/jivesoftware/util/JiveGlobals.java

@@ -898,7 +898,7 @@ public class JiveGlobals {
         clearXMLPropertyEncryptionEntry(name);
     }
 
-    private static void clearXMLPropertyEncryptionEntry(String name) {
+    static void clearXMLPropertyEncryptionEntry(String name) {
         if (isSetupMode()) {
             return;
         }

src/java/org/jivesoftware/util/JiveProperties.java

@@ -293,6 +293,9 @@ public class JiveProperties implements Map<String, String> {
 
             result = properties.put(key, value);
             encrypted.put(key, isEncrypted);
+            if(!isEncrypted) {
+                JiveGlobals.clearXMLPropertyEncryptionEntry(key);
+            }
         }
 
         // Generate event.
@@ -314,6 +317,9 @@ public class JiveProperties implements Map<String, String> {
     void localPut(String key, String value, boolean isEncrypted) {
         properties.put(key, value);
         encrypted.put(key, isEncrypted);
+        if (!isEncrypted) {
+            JiveGlobals.clearXMLPropertyEncryptionEntry(key);
+        }
 
         // Generate event.
         Map<String, Object> params = new HashMap<>();