JIRA-WDT-391 Fix ordered dictionary to completely delete keys; use delete in variable substitution (#533)

Author: rakillen

core/src/main/java/oracle/weblogic/deploy/util/PyOrderedDict.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 package oracle.weblogic.deploy.util;
@@ -203,6 +203,7 @@ public void __delitem__(PyObject key) {
                 throw Py.KeyError(key.toString());
             }
         }
+        super.__delitem__(key);
     }
 
     /**

core/src/main/python/wlsdeploy/util/variables.py

@@ -188,7 +188,7 @@ def _process_node(nodes, variables, model_context):
         # if the key changes with substitution, remove old key and map value to new key
         new_key = _substitute(key, variables, model_context)
         if new_key is not key:
-            nodes.pop(key)
+            del nodes[key]
             nodes[new_key] = value
 
         if isinstance(value, dict):