diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-ref.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-ref.xml
index c534c327194..4fe3db74d9f 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-ref.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-ref.xml
@@ -32,7 +32,7 @@ under the License.
   </inConfigs>
 </configConfMos>
 
-<!--
-    aclpolicyrefdn="org-root/org-vlan-123/org-VDC-vlan-123/pset-Ingress-ACL-Policy-Set-vlan-123/polref-aaa"
-    aclpolicyname="aaa"
---!>
+<!--
+    aclpolicyrefdn="org-root/org-vlan-123/org-VDC-vlan-123/pset-Ingress-ACL-Policy-Set-vlan-123/polref-aaa"
+    aclpolicyname="aaa"
+-->
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-set.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-set.xml
index b475d2ca564..a04be156446 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-set.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-set.xml
@@ -30,7 +30,7 @@ under the License.
   </inConfigs>
 </configConfMos>
 
-<!--
-    aclpolicysetdn="org-root/org-vlan-123/org-VDC-vlan-123/pset-foo"
-    aclpolicysetname="foo"
---!>
+<!--
+    aclpolicysetdn="org-root/org-vlan-123/org-VDC-vlan-123/pset-foo"
+    aclpolicysetname="foo"
+-->
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy.xml
index e71cd429858..c6f7d371e4b 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy.xml
@@ -29,7 +29,7 @@ under the License.
     </inConfig>
 </configConfMo>
 
-<!--
-    aclpolicydn="org-root/org-vlan-123/org-VDC-vlan-123/pol-test_policy"
-    aclpolicyname="test_policy"
---!>
\ No newline at end of file
+<!--
+    aclpolicydn="org-root/org-vlan-123/org-VDC-vlan-123/pol-test_policy"
+    aclpolicyname="test_policy"
+-->
\ No newline at end of file
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-dnat.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-dnat.xml
index 5b6aaa3f59b..e1ec9adf4cf 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-dnat.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-dnat.xml
@@ -76,7 +76,7 @@ under the License.
 <!--
     aclruledn="org-root/org-vlan-123/org-VDC-vlan-123/pol-test_policy/rule-dummy"
     aclrulename="dummy"
-    descr=value
-    actiontype="drop" or "permit"
-    ip="public ip at destination"
---!>
+    descr=value
+    actiontype="drop" or "permit"
+    ip="public ip at destination"
+-->
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-pf.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-pf.xml
index 1a1d9cbf3e2..e0fa2e48b43 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-pf.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-pf.xml
@@ -150,7 +150,7 @@ under the License.
     descr=value
     actiontype="drop" or "permit"
     protocolvalue="TCP" or "UDP"
-    ip="public ip at destination"
-    startport="start port at destination"
-    endport="end port at destination"
---!>
+    ip="public ip at destination"
+    startport="start port at destination"
+    endport="end port at destination"
+-->
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dhcp-policy.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dhcp-policy.xml
index 5bb4abcd8e1..cab9f9861ec 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dhcp-policy.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dhcp-policy.xml
@@ -69,4 +69,4 @@ under the License.
     "org-root/org-TenantC/org-VDC-TenantC/dhcp-server-TenantC-Dhcp-Policy/ip-range-iprange"
     "org-root/org-TestTenant3/org-Tenant3-VDC/dhcp-server-Tenant3-DHCP-Policy/dns-svc-Tenant3-DNS" 
     "org-root/org-TestTenant3/org-Tenant3-VDC/dhcp-server-Tenant3-DHCP-Policy/dns-svc-Tenant3-DNS/dns-8.8.8.8" 
---!>
+-->
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dnat-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dnat-rule.xml
index bd8dbff6d32..308664d625e 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dnat-rule.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dnat-rule.xml
@@ -85,7 +85,7 @@ under the License.
 <!--
     natruledn="org-root/org-vlan-123/org-VDC-vlan-123/natpol-aaa/rule-bbb"
     natrulename="bbb"
-    descr=value
-    ippoolname="ccc"
-    ip="10.147.30.230"
---!>
+    descr=value
+    ippoolname="ccc"
+    ip="10.147.30.230"
+-->
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-firewall.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-firewall.xml
index e5447e39e63..d2ab997ce73 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-firewall.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-firewall.xml
@@ -86,4 +86,4 @@ under the License.
     ipAddressPrimary="%publicip%"
     ipSubnet="%outsidesubnet%"
     name="%outsideintfname%
---!>
+-->
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-security-profile.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-security-profile.xml
index e2f5eaf0686..29f7111c56a 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-security-profile.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-security-profile.xml
@@ -38,4 +38,4 @@ under the License.
     egressAclPsetRef="default-egress"
     ingressAclPsetRef="default-ingress"
     name="Tenant3-ESSP"
---!>
+-->
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-egress-acl-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-egress-acl-rule.xml
index f283ffeb333..d6e4676ba91 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-egress-acl-rule.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-egress-acl-rule.xml
@@ -162,7 +162,7 @@ under the License.
     actiontype="drop" or "permit"
     protocolvalue = "TCP" or "UDP"
     sourcestartip="source start ip"
-    sourceendip="source end ip"
-    deststartport="start port at destination"
-    destendport="end port at destination"
---!>
+    sourceendip="source end ip"
+    deststartport="start port at destination"
+    destendport="end port at destination"
+-->
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-no-protocol-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-no-protocol-rule.xml
index e6f4cfb63d1..fac59f3bcd3 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-no-protocol-rule.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-no-protocol-rule.xml
@@ -88,7 +88,7 @@ under the License.
     aclruledn="org-root/org-vlan-123/org-VDC-vlan-123/pol-test_policy/rule-dummy"
     aclrulename="dummy"
     descr=value
-    actiontype="drop" or "permit"
-    sourcestartip="source start ip"
-    sourceendip="source end ip"
---!>
+    actiontype="drop" or "permit"
+    sourcestartip="source start ip"
+    sourceendip="source end ip"
+-->
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-rule.xml
index 55edd1fa728..7a5b9d8c9e6 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-rule.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-rule.xml
@@ -115,7 +115,7 @@ under the License.
     aclrulename="dummy"
     descr=value
     actiontype="drop" or "permit"
-    protocolvalue = "TCP" or "UDP" or "ICMP"
-    sourcestartip="source start ip"
-    sourceendip="source end ip"
---!>
+    protocolvalue = "TCP" or "UDP" or "ICMP"
+    sourcestartip="source start ip"
+    sourceendip="source end ip"
+-->
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-ingress-acl-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-ingress-acl-rule.xml
index 7c1164138bc..bd368f579a0 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-ingress-acl-rule.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-ingress-acl-rule.xml
@@ -115,7 +115,7 @@ under the License.
     aclrulename="dummy"
     descr=value
     actiontype="drop" or "permit"
-    protocolvalue = "TCP" or "UDP" or "ICMP"
-    sourcestartip = "source start IP"
-    sourceendip = "source end IP"
---!>
+    protocolvalue = "TCP" or "UDP" or "ICMP"
+    sourcestartip = "source start IP"
+    sourceendip = "source end IP"
+-->
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule.xml
index f283ffeb333..d6e4676ba91 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule.xml
@@ -162,7 +162,7 @@ under the License.
     actiontype="drop" or "permit"
     protocolvalue = "TCP" or "UDP"
     sourcestartip="source start ip"
-    sourceendip="source end ip"
-    deststartport="start port at destination"
-    destendport="end port at destination"
---!>
+    sourceendip="source end ip"
+    deststartport="start port at destination"
+    destendport="end port at destination"
+-->
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ip-pool.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ip-pool.xml
index 4cf0451c33d..876fa21b1d9 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ip-pool.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ip-pool.xml
@@ -52,7 +52,7 @@ under the License.
 </configConfMos>
 
 <!--
-    ippooldn="org-root/org-vlan-123/org-VDC-vlan-123/objgrp-ccc"
-    ippoolname="ccc"
-    ipvalue="10.1.1.20"
---!>
\ No newline at end of file
+    ippooldn="org-root/org-vlan-123/org-VDC-vlan-123/objgrp-ccc"
+    ippoolname="ccc"
+    ipvalue="10.1.1.20"
+-->
\ No newline at end of file
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-ref.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-ref.xml
index 450d40c9d6d..0e7d6e074ba 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-ref.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-ref.xml
@@ -32,7 +32,7 @@ under the License.
   </inConfigs>
 </configConfMos>
 
-<!--
-    natpolicyrefdn="org-root/org-TenantD/org-VDC-TenantD/natpset-TenantD-NAT-Policy-Set/polref-Source-NAT-Policy-TenantD"
-    natpolicyname="Source-NAT-Policy-TenantD"
---!>
+<!--
+    natpolicyrefdn="org-root/org-TenantD/org-VDC-TenantD/natpset-TenantD-NAT-Policy-Set/polref-Source-NAT-Policy-TenantD"
+    natpolicyname="Source-NAT-Policy-TenantD"
+-->
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-set.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-set.xml
index 090caf15cb4..2e2c63e85f1 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-set.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-set.xml
@@ -34,4 +34,4 @@ under the License.
 <!--
     natpolicysetdn="org-root/org-TenantD/org-VDC-TenantD/natpset-TenantD-NAT-Policy-Set"
     natpolicysetname="Source-NAT-Policy-Set-TenantD"
---!>
+-->
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-pf-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-pf-rule.xml
index a8a631f5d7f..4cfecd43192 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-pf-rule.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-pf-rule.xml
@@ -160,7 +160,7 @@ under the License.
     ippoolname="ccc"
     portpoolname="ddd"
     ip="10.147.30.230"
-    startport="22"
-    endport="22"
-    protocolvalue="TCP"
---!>
+    startport="22"
+    endport="22"
+    protocolvalue="TCP"
+-->
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-port-pool.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-port-pool.xml
index e1b7be024f7..d218eece8e2 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-port-pool.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-port-pool.xml
@@ -66,7 +66,7 @@ under the License.
 
 <!--
     portpooldn="org-root/org-vlan-123/org-VDC-vlan-123/objgrp-ddd"
-    portpoolname="ddd"
-    startport="22"
-    endport="22"
---!>
+    portpoolname="ddd"
+    startport="22"
+    endport="22"
+-->
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-pool.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-pool.xml
index 2ad1e8798a5..957bc9f6a9a 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-pool.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-pool.xml
@@ -55,4 +55,4 @@ under the License.
     publicipdn="org-root/org-TestTenant3/org-Tenant3-VDC/objgrp-Source-NAT-Pool-For-Tenant3/objgrp-expr-2/nw-ip-2"
     snatpooldn= "org-root/org-TestTenant3/org-Tenant3-VDC/objgrp-Source-NAT-Pool-For-Tenant3"
     value="10.223.136.10"
---!>
+-->
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-rule.xml
index a3ee9875e19..9980df1d2c7 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-rule.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-rule.xml
@@ -100,4 +100,4 @@ under the License.
     ippoolname=value
     srcstartip=value
     srcendip=value
---!>
+-->
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-acl-policies.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-acl-policies.xml
index aec800e9f4a..aee2f891f86 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-acl-policies.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-acl-policies.xml
@@ -25,7 +25,7 @@ under the License.
   <inFilter>
   </inFilter>
 </orgResolveInScope>
-
-<!--
-    vdcdn="org-root/org-vlan-123/org-VDC-vlan-123"
---!>
+
+<!--
+    vdcdn="org-root/org-vlan-123/org-VDC-vlan-123"
+-->
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-children.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-children.xml
index f272999a76c..a24b1cf1028 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-children.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-children.xml
@@ -21,7 +21,7 @@ under the License.
   inDn="%dn%"
   inHierarchical="true">
   <inFilter>
-  </inFilter>
-</configResolveChildren>
-
-<!--dn="org-root/org-vlan-517/org-VDC-vlan-517/natpol-DNAT-vlan-517-10-147-30-235"--!>
+  </inFilter>
+</configResolveChildren>
+
+<!--dn="org-root/org-vlan-517/org-VDC-vlan-517/natpol-DNAT-vlan-517-10-147-30-235"-->
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-nat-policies.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-nat-policies.xml
index 720ced06d8a..bd978cb389c 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-nat-policies.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-nat-policies.xml
@@ -25,7 +25,7 @@ under the License.
   <inFilter>
   </inFilter>
 </orgResolveInScope>
-
-<!--
-    vdcdn="org-root/org-vlan-123/org-VDC-vlan-123"
---!>
+
+<!--
+    vdcdn="org-root/org-vlan-123/org-VDC-vlan-123"
+-->
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-policyrefs-in-policyset.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-policyrefs-in-policyset.xml
index c53af90369d..cda51c51fdf 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-policyrefs-in-policyset.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-policyrefs-in-policyset.xml
@@ -25,7 +25,7 @@ under the License.
   <inFilter>
   </inFilter>
 </orgResolveInScope>
-
-<!--
-    vdcdn="org-root/org-vlan-123/org-VDC-vlan-123"
---!>
+
+<!--
+    vdcdn="org-root/org-vlan-123/org-VDC-vlan-123"
+-->