1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>

1 files changed, 252 insertions, 249 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateVfModule.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateVfModule.bpmn
index 5911067a49..ce96a3593a 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateVfModule.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateVfModule.bpmn
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_Wblj8GyfEeWUWLTvug7ZOg" exporter="camunda modeler" exporterVersion="2.7.0" targetNamespace="http://camunda.org/schema/1.0/bpmn">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_Wblj8GyfEeWUWLTvug7ZOg" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="DoUpdateVfModule" name="DoUpdateVfModule" isExecutable="true">
-    <bpmn2:documentation>This flow expects its incoming request to be in the variable 'DoUpdateVfModuleRequest'.  This flow produces no output.</bpmn2:documentation>
+    <bpmn2:documentation><![CDATA[This flow expects its incoming request to be in the variable 'DoUpdateVfModuleRequest'.  This flow produces no output.]]></bpmn2:documentation>
     <bpmn2:scriptTask id="PrepareUpdateAAIVfModule_prep" name="Prepare Update AAI Vf Module (prep)" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_38</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
@@ -9,16 +9,16 @@
 def duvm = new DoUpdateVfModule()
 duvm.prepPrepareUpdateAAIVfModule(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="PrepareUpdateAAIVfModule_prep" targetRef="ScriptTask_1"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="PrepareUpdateAAIVfModule_prep" targetRef="ScriptTask_1" />
     <bpmn2:callActivity id="ScriptTask_1" name="Prepare Update AAI Vf Module" calledElement="PrepareUpdateAAIVfModule">
       <bpmn2:extensionElements>
-        <camunda:in source="DOUPVfMod_prepareUpdateAAIVfModuleRequest" target="PrepareUpdateAAIVfModuleRequest"/>
-        <camunda:in source="mso-request-id" target="mso-request-id"/>
-        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/>
-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled"/>
-        <camunda:out source="PUAAIVfMod_outVfModule" target="DOUPVfMod_vfModule"/>
-        <camunda:out source="PUAAIVfMod_vnfName" target="DOUPVfMod_vnfNameFromAAI"/>
-        <camunda:out source="WorkflowException" target="WorkflowException"/>
+        <camunda:in source="DOUPVfMod_prepareUpdateAAIVfModuleRequest" target="PrepareUpdateAAIVfModuleRequest" />
+        <camunda:in source="mso-request-id" target="mso-request-id" />
+        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:out source="PUAAIVfMod_outVfModule" target="DOUPVfMod_vfModule" />
+        <camunda:out source="PUAAIVfMod_vnfName" target="DOUPVfMod_vnfNameFromAAI" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_15</bpmn2:outgoing>
@@ -30,7 +30,7 @@ duvm.prepPrepareUpdateAAIVfModule(execution)]]></bpmn2:script>
 def duvm = new DoUpdateVfModule()
 duvm.preProcessRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_38" name="" sourceRef="ProcessReceivedRequest" targetRef="PrepareUpdateAAIVfModule_prep"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_38" name="" sourceRef="ProcessReceivedRequest" targetRef="PrepareUpdateAAIVfModule_prep" />
     <bpmn2:subProcess id="SubProcess_1" name="Catch Exception" triggeredByEvent="true">
       <bpmn2:scriptTask id="ScriptTask_16" name="Handle Exception" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>
@@ -41,24 +41,24 @@ duvm.handleWorkflowException(execution)]]></bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:endEvent id="EndEvent_3">
         <bpmn2:incoming>SequenceFlow_35</bpmn2:incoming>
-        <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_11"/>
+        <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_11" />
       </bpmn2:endEvent>
-      <bpmn2:sequenceFlow id="SequenceFlow_35" name="" sourceRef="ScriptTask_16" targetRef="EndEvent_3"/>
+      <bpmn2:sequenceFlow id="SequenceFlow_35" name="" sourceRef="ScriptTask_16" targetRef="EndEvent_3" />
       <bpmn2:startEvent id="StartEvent_3">
         <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
-        <bpmn2:errorEventDefinition id="ErrorEventDefinition_2"/>
+        <bpmn2:errorEventDefinition id="ErrorEventDefinition_2" />
       </bpmn2:startEvent>
-      <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="StartEvent_3" targetRef="ScriptTask_16"/>
+      <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="StartEvent_3" targetRef="ScriptTask_16" />
     </bpmn2:subProcess>
     <bpmn2:endEvent id="EndEvent_5">
       <bpmn2:incoming>SequenceFlow_36</bpmn2:incoming>
-      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_12"/>
+      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_12" />
     </bpmn2:endEvent>
     <bpmn2:boundaryEvent id="BoundaryEvent_1" name="" attachedToRef="SubProcess_1">
       <bpmn2:outgoing>SequenceFlow_36</bpmn2:outgoing>
-      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_70"/>
+      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_70" />
     </bpmn2:boundaryEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_36" name="" sourceRef="BoundaryEvent_1" targetRef="EndEvent_5"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_36" name="" sourceRef="BoundaryEvent_1" targetRef="EndEvent_5" />
     <bpmn2:scriptTask id="ScriptTask_10" name="Update AAI Vf Module (prep)" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_18</bpmn2:incoming>
@@ -67,19 +67,19 @@ duvm.handleWorkflowException(execution)]]></bpmn2:script>
 def duvm = new DoUpdateVfModule()
 duvm.prepUpdateAAIVfModule(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_25" name="" sourceRef="ScriptTask_10" targetRef="ScriptTask_11"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_25" name="" sourceRef="ScriptTask_10" targetRef="ScriptTask_11" />
     <bpmn2:callActivity id="ScriptTask_11" name="UpdateAAIVfModule" calledElement="UpdateAAIVfModule">
       <bpmn2:extensionElements>
-        <camunda:out source="WorkflowException" target="WorkflowException"/>
-        <camunda:in source="DOUPVfMod_updateAAIVfModuleRequest" target="UpdateAAIVfModuleRequest"/>
-        <camunda:in source="mso-request-id" target="mso-request-id"/>
-        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/>
-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled"/>
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:in source="DOUPVfMod_updateAAIVfModuleRequest" target="UpdateAAIVfModuleRequest" />
+        <camunda:in source="mso-request-id" target="mso-request-id" />
+        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_25</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_26</bpmn2:outgoing>
     </bpmn2:callActivity>
-    <bpmn2:sequenceFlow id="SequenceFlow_26" name="" sourceRef="ScriptTask_11" targetRef="ScriptTask_12"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_26" name="" sourceRef="ScriptTask_11" targetRef="ScriptTask_12" />
     <bpmn2:scriptTask id="ScriptTask_12" name="SDNC Topology Activate (prep)" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_26</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_27</bpmn2:outgoing>
@@ -87,16 +87,16 @@ duvm.prepUpdateAAIVfModule(execution)]]></bpmn2:script>
 def duvm = new DoUpdateVfModule()
 duvm.prepSDNCTopologyAct(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_27" name="" sourceRef="ScriptTask_12" targetRef="ScriptTask_13"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_27" name="" sourceRef="ScriptTask_12" targetRef="ScriptTask_13" />
     <bpmn2:callActivity id="ScriptTask_13" name="SDNCAdapter Topology Activate" calledElement="sdncAdapter">
       <bpmn2:extensionElements>
-        <camunda:in source="DOUPVfMod_sdncActivateRequest" target="sdncAdapterWorkflowRequest"/>
-        <camunda:in source="mso-request-id" target="mso-request-id"/>
-        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/>
-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled"/>
-        <camunda:out source="WorkflowException" target="WorkflowException"/>
-        <camunda:out source="sdncAdapterResponse" target="DOUPVfMod_sdncActivateResponse"/>
-        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator"/>        
+        <camunda:in source="DOUPVfMod_sdncActivateRequest" target="sdncAdapterWorkflowRequest" />
+        <camunda:in source="mso-request-id" target="mso-request-id" />
+        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="sdncAdapterResponse" target="DOUPVfMod_sdncActivateResponse" />
+        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_27</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>
@@ -108,32 +108,33 @@ duvm.prepSDNCTopologyAct(execution)]]></bpmn2:script>
 def duvm = new DoUpdateVfModule()
 duvm.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="ScriptTask_14" targetRef="ExclusiveGateway_1"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="ScriptTask_14" targetRef="ExclusiveGateway_1" />
     <bpmn2:callActivity id="CallActivity_1" name="UpdateAAIGenericVnf" calledElement="UpdateAAIGenericVnf">
       <bpmn2:extensionElements>
-        <camunda:in source="DOUPVfMod_updateAAIGenericVnfRequest" target="UpdateAAIGenericVnfRequest"/>
-        <camunda:in source="mso-request-id" target="mso-request-id"/>
-        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/>
-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled"/>
-        <camunda:out source="WorkflowException" target="WorkflowException"/>
+        <camunda:in source="DOUPVfMod_updateAAIGenericVnfRequest" target="UpdateAAIGenericVnfRequest" />
+        <camunda:in source="mso-request-id" target="mso-request-id" />
+        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_14</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>
     </bpmn2:callActivity>
-    <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="CallActivity_1" targetRef="ScriptTask_10"/>
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_1" name="Skip Update&#xD;&#xA;Generic Vnf?" default="SequenceFlow_14">
+    <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="CallActivity_1" targetRef="ScriptTask_10" />
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_1" name="Skip Update
+&#10;Generic Vnf?" default="SequenceFlow_14">
       <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
       <bpmn2:outgoing>SequenceFlow_18</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_14" name="Do the update" sourceRef="ExclusiveGateway_1" targetRef="CallActivity_1"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_14" name="Do the update" sourceRef="ExclusiveGateway_1" targetRef="CallActivity_1" />
     <bpmn2:sequenceFlow id="SequenceFlow_18" name="Skip the update" sourceRef="ExclusiveGateway_1" targetRef="ScriptTask_10">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">${execution.getVariable('DOUPVfMod_skipUpdateGenericVnf')} == true</bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[${execution.getVariable('DOUPVfMod_skipUpdateGenericVnf')} == true]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:startEvent id="StartEvent_1" name="Start">
       <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
     </bpmn2:startEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="ProcessReceivedRequest"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="ProcessReceivedRequest" />
     <bpmn2:scriptTask id="ScriptTask_4" name="SDNC Topology Change/Assign (prep)" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_16</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_17</bpmn2:incoming>
@@ -142,33 +143,33 @@ duvm.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script>
 def duvm = new DoUpdateVfModule()
 duvm.prepSDNCTopologyChg(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="ScriptTask_4" targetRef="ScriptTask_5"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="ScriptTask_4" targetRef="ScriptTask_5" />
     <bpmn2:callActivity id="ScriptTask_5" name="SDNC Adapter Topology Change/Assign" calledElement="sdncAdapter">
       <bpmn2:extensionElements>
-        <camunda:in source="DOUPVfMod_sdncChangeAssignRequest" target="sdncAdapterWorkflowRequest"/>
-        <camunda:in source="mso-request-id" target="mso-request-id"/>
-        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/>
-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled"/>
-        <camunda:out source="WorkflowException" target="WorkflowException"/>
-        <camunda:out source="sdncAdapterResponse" target="DOUPVfMod_sdncChangeAssignResponse"/>
-        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator"/>
+        <camunda:in source="DOUPVfMod_sdncChangeAssignRequest" target="sdncAdapterWorkflowRequest" />
+        <camunda:in source="mso-request-id" target="mso-request-id" />
+        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="sdncAdapterResponse" target="DOUPVfMod_sdncChangeAssignResponse" />
+        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
     </bpmn2:callActivity>
     <bpmn2:callActivity id="ScriptTask_9" name="VnfAdapterRest" calledElement="vnfAdapterRestV1">
       <bpmn2:extensionElements>
-        <camunda:in source="DOUPVfMod_vnfAdapterRestRequest" target="vnfAdapterRestV1Request"/>
-        <camunda:in source="mso-request-id" target="mso-request-id"/>
-        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/>
-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled"/>
-        <camunda:out source="WorkflowException" target="WorkflowException"/>
-        <camunda:out source="vnfAdapterRestV1Response" target="DOUPVfMod_vnfAdapterRestResponse"/>
+        <camunda:in source="DOUPVfMod_vnfAdapterRestRequest" target="vnfAdapterRestV1Request" />
+        <camunda:in source="mso-request-id" target="mso-request-id" />
+        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="vnfAdapterRestV1Response" target="DOUPVfMod_vnfAdapterRestResponse" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_21</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_24</bpmn2:outgoing>
     </bpmn2:callActivity>
-    <bpmn2:sequenceFlow id="SequenceFlow_24" name="" sourceRef="ScriptTask_9" targetRef="ScriptTask_14"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_24" name="" sourceRef="ScriptTask_9" targetRef="ScriptTask_14" />
     <bpmn2:scriptTask id="ScriptTask_8" name="VNF Adapter (prep)" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_21</bpmn2:outgoing>
@@ -176,7 +177,7 @@ duvm.prepSDNCTopologyChg(execution)]]></bpmn2:script>
 def duvm = new DoUpdateVfModule()
 duvm.prepVnfAdapterRest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_21" name="" sourceRef="ScriptTask_8" targetRef="ScriptTask_9"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_21" name="" sourceRef="ScriptTask_8" targetRef="ScriptTask_9" />
     <bpmn2:scriptTask id="ScriptTask_15" name="Validate SDNC Query Response" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_22</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_23</bpmn2:outgoing>
@@ -187,13 +188,13 @@ duvm.validateSDNCResponse(execution, response, "query")]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:callActivity id="ScriptTask_7" name="SDNCAdapter Topology Query" calledElement="sdncAdapter">
       <bpmn2:extensionElements>
-        <camunda:in source="DOUPVfMod_sdncTopologyRequest" target="sdncAdapterWorkflowRequest"/>
-        <camunda:in source="mso-request-id" target="mso-request-id"/>
-        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/>
-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled"/>
-        <camunda:out source="WorkflowException" target="WorkflowException"/>
-        <camunda:out source="sdncAdapterResponse" target="DOUPVfMod_sdncTopologyResponse"/>
-        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator"/>
+        <camunda:in source="DOUPVfMod_sdncTopologyRequest" target="sdncAdapterWorkflowRequest" />
+        <camunda:in source="mso-request-id" target="mso-request-id" />
+        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="sdncAdapterResponse" target="DOUPVfMod_sdncTopologyResponse" />
+        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_19</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_22</bpmn2:outgoing>
@@ -206,8 +207,8 @@ String response = execution.getVariable("DOUPVfMod_sdncChangeAssignResponse")
 def duvm = new DoUpdateVfModule()
 duvm.validateSDNCResponse(execution, response, "changeassign")]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="ScriptTask_5" targetRef="ScriptTask_18"/>
-    <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ScriptTask_18" targetRef="ScriptTask_6"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="ScriptTask_5" targetRef="ScriptTask_18" />
+    <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ScriptTask_18" targetRef="ScriptTask_6" />
     <bpmn2:scriptTask id="ScriptTask_6" name="SDNC Topology Query (prep)" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_19</bpmn2:outgoing>
@@ -215,29 +216,30 @@ duvm.validateSDNCResponse(execution, response, "changeassign")]]></bpmn2:script>
 def duvm = new DoUpdateVfModule()
 duvm.prepSDNCTopologyQuery(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_19" name="" sourceRef="ScriptTask_6" targetRef="ScriptTask_7"/>
-    <bpmn2:sequenceFlow id="SequenceFlow_22" name="" sourceRef="ScriptTask_7" targetRef="ScriptTask_15"/>
-    <bpmn2:sequenceFlow id="SequenceFlow_23" name="" sourceRef="ScriptTask_15" targetRef="ScriptTask_8"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_19" name="" sourceRef="ScriptTask_6" targetRef="ScriptTask_7" />
+    <bpmn2:sequenceFlow id="SequenceFlow_22" name="" sourceRef="ScriptTask_7" targetRef="ScriptTask_15" />
+    <bpmn2:sequenceFlow id="SequenceFlow_23" name="" sourceRef="ScriptTask_15" targetRef="ScriptTask_8" />
     <bpmn2:exclusiveGateway id="IsBaseVfModule" name="Is Base VF Module?" default="SequenceFlow_30">
       <bpmn2:incoming>SequenceFlow_15</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_28</bpmn2:outgoing>
       <bpmn2:outgoing>SequenceFlow_30</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_15" name="" sourceRef="ScriptTask_1" targetRef="IsBaseVfModule"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_15" name="" sourceRef="ScriptTask_1" targetRef="IsBaseVfModule" />
     <bpmn2:callActivity id="ScriptTask_3" name="Confirm VolumeGroup Tenant" calledElement="ConfirmVolumeGroupTenant">
       <bpmn2:extensionElements>
-        <camunda:in source="DOUPVfMod_volumeGroupId" target="volumeGroupId"/>
-        <camunda:in source="DOUPVfMod_tenantId" target="tenantId"/>
-        <camunda:in source="DOUPVfMod_aicCloudRegion" target="aicCloudRegion"/>
-        <camunda:in source="mso-request-id" target="mso-request-id"/>
-        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/>
-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled"/>
-        <camunda:out source="WorkflowException" target="WorkflowException"/>
+        <camunda:in source="DOUPVfMod_volumeGroupId" target="volumeGroupId" />
+        <camunda:in source="DOUPVfMod_tenantId" target="tenantId" />
+        <camunda:in source="DOUPVfMod_cloudRegionForVolume" target="aicCloudRegion" />
+        <camunda:in source="mso-request-id" target="mso-request-id" />
+        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="ConfirmVolumeGroupTenantResponse" target="DOUPVfMod_volumeGroupStackId" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_11</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_17</bpmn2:outgoing>
     </bpmn2:callActivity>
-    <bpmn2:sequenceFlow id="SequenceFlow_17" name="" sourceRef="ScriptTask_3" targetRef="ScriptTask_4"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_17" name="" sourceRef="ScriptTask_3" targetRef="ScriptTask_4" />
     <bpmn2:scriptTask id="ScriptTask_2" name="Confirm VolumeGroup Tenant (prep)" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>
@@ -245,16 +247,17 @@ duvm.prepSDNCTopologyQuery(execution)]]></bpmn2:script>
 def duvm = new DoUpdateVfModule()
 duvm.prepConfirmVolumeGroupTenant(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="ScriptTask_2" targetRef="ScriptTask_3"/>
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_2" name="VolumeGroupId &#xD;&#xA;present?" default="SequenceFlow_16">
+    <bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="ScriptTask_2" targetRef="ScriptTask_3" />
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_2" name="VolumeGroupId 
+&#10;present?" default="SequenceFlow_16">
       <bpmn2:incoming>SequenceFlow_29</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>
       <bpmn2:outgoing>SequenceFlow_16</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_10" name="Yes" sourceRef="ExclusiveGateway_2" targetRef="ScriptTask_2">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">${execution.getVariable('DOUPVfMod_volumeGroupId').isEmpty()} == false</bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[${execution.getVariable('DOUPVfMod_volumeGroupId').isEmpty()} == false]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_16" name="No" sourceRef="ExclusiveGateway_2" targetRef="ScriptTask_4"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_16" name="No" sourceRef="ExclusiveGateway_2" targetRef="ScriptTask_4" />
     <bpmn2:sequenceFlow id="SequenceFlow_28" name="yes" sourceRef="IsBaseVfModule" targetRef="ExclusiveGateway_3">
       <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DOUPVfMod_isBaseVfModule") == "true"]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
@@ -265,15 +268,15 @@ duvm.prepConfirmVolumeGroupTenant(execution)]]></bpmn2:script>
 def doUpdateVfModule = new DoUpdateVfModule()
 doUpdateVfModule.queryAAIVfModule(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_30" name="no" sourceRef="IsBaseVfModule" targetRef="QueryAAIVfModule"/>
-    <bpmn2:sequenceFlow id="SequenceFlow_34" name="" sourceRef="QueryAAIVfModule" targetRef="ExclusiveGateway_3"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_30" name="no" sourceRef="IsBaseVfModule" targetRef="QueryAAIVfModule" />
+    <bpmn2:sequenceFlow id="SequenceFlow_34" name="" sourceRef="QueryAAIVfModule" targetRef="ExclusiveGateway_3" />
     <bpmn2:exclusiveGateway id="ExclusiveGateway_3">
       <bpmn2:incoming>SequenceFlow_28</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_34</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_29</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_29" name="" sourceRef="ExclusiveGateway_3" targetRef="ExclusiveGateway_2"/>
-    <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="ScriptTask_13" targetRef="ScriptTask_19"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_29" name="" sourceRef="ExclusiveGateway_3" targetRef="ExclusiveGateway_2" />
+    <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="ScriptTask_13" targetRef="ScriptTask_19" />
     <bpmn2:scriptTask id="ScriptTask_19" name="PostProcess SDNC Adapter Activate" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_20</bpmn2:outgoing>
@@ -288,381 +291,381 @@ duvm.validateSDNCResponse(execution, response, "activate")]]></bpmn2:script>
       <bpmn2:script><![CDATA[// This variable is checked by the unit test
 execution.setVariable('DoUpdateVfModuleSuccessIndicator', true)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="ScriptTask_17" targetRef="EndEvent_1"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="ScriptTask_17" targetRef="EndEvent_1" />
     <bpmn2:endEvent id="EndEvent_1" name="TheEnd">
       <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
-      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_10"/>
+      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_10" />
     </bpmn2:endEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_20" name="" sourceRef="ScriptTask_19" targetRef="ScriptTask_17"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_20" name="" sourceRef="ScriptTask_19" targetRef="ScriptTask_17" />
   </bpmn2:process>
-  <bpmn2:error id="Error_1" errorCode="MSOWorkflowException" name="MSO Workflow Exception"/>
+  <bpmn2:error id="Error_1" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoUpdateVfModule">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_37" bpmnElement="StartEvent_1">
-        <dc:Bounds height="36.0" width="36.0" x="150.0" y="214.0"/>
+        <dc:Bounds x="150" y="214" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="34.0" x="151.0" y="255.0"/>
+          <dc:Bounds x="151" y="255" width="34" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_22" bpmnElement="ProcessReceivedRequest">
-        <dc:Bounds height="80.0" width="100.0" x="300.0" y="192.0"/>
+        <dc:Bounds x="300" y="192" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_37" targetElement="_BPMNShape_ScriptTask_22">
-        <di:waypoint xsi:type="dc:Point" x="186.0" y="232.0"/>
-        <di:waypoint xsi:type="dc:Point" x="300.0" y="232.0"/>
+        <di:waypoint xsi:type="dc:Point" x="186" y="232" />
+        <di:waypoint xsi:type="dc:Point" x="300" y="232" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="208.0" y="232.0"/>
+          <dc:Bounds x="208" y="232" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_160" bpmnElement="PrepareUpdateAAIVfModule_prep">
-        <dc:Bounds height="80.0" width="100.0" x="456.0" y="192.0"/>
+        <dc:Bounds x="456" y="192" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_38" bpmnElement="SequenceFlow_38" sourceElement="_BPMNShape_ScriptTask_22" targetElement="_BPMNShape_ScriptTask_160">
-        <di:waypoint xsi:type="dc:Point" x="400.0" y="232.0"/>
-        <di:waypoint xsi:type="dc:Point" x="456.0" y="232.0"/>
+        <di:waypoint xsi:type="dc:Point" x="400" y="232" />
+        <di:waypoint xsi:type="dc:Point" x="456" y="232" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="492.0" y="232.0"/>
+          <dc:Bounds x="492" y="232" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_164" bpmnElement="ScriptTask_1">
-        <dc:Bounds height="80.0" width="100.0" x="624.0" y="192.0"/>
+        <dc:Bounds x="624" y="192" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_160" targetElement="_BPMNShape_ScriptTask_164">
-        <di:waypoint xsi:type="dc:Point" x="556.0" y="232.0"/>
-        <di:waypoint xsi:type="dc:Point" x="624.0" y="232.0"/>
+        <di:waypoint xsi:type="dc:Point" x="556" y="232" />
+        <di:waypoint xsi:type="dc:Point" x="624" y="232" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="575.0" y="232.0"/>
+          <dc:Bounds x="575" y="232" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_88" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="1039.0" y="206.0"/>
+        <dc:Bounds x="1039" y="206" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="38.0" width="109.0" x="1011.0" y="172.0"/>
+          <dc:Bounds x="1011" y="172" width="109" height="38" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_165" bpmnElement="ScriptTask_2">
-        <dc:Bounds height="80.0" width="100.0" x="1152.0" y="192.0"/>
+        <dc:Bounds x="1152" y="192" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ExclusiveGateway_88" targetElement="_BPMNShape_ScriptTask_165">
-        <di:waypoint xsi:type="dc:Point" x="1089.0" y="231.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1118.0" y="231.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1118.0" y="232.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1152.0" y="232.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1089" y="231" />
+        <di:waypoint xsi:type="dc:Point" x="1118" y="231" />
+        <di:waypoint xsi:type="dc:Point" x="1118" y="232" />
+        <di:waypoint xsi:type="dc:Point" x="1152" y="232" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="29.0" x="1099.0" y="231.0"/>
+          <dc:Bounds x="1099" y="231" width="29" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_166" bpmnElement="ScriptTask_3">
-        <dc:Bounds height="80.0" width="100.0" x="1308.0" y="192.0"/>
+        <dc:Bounds x="1308" y="192" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_ScriptTask_165" targetElement="_BPMNShape_ScriptTask_166">
-        <di:waypoint xsi:type="dc:Point" x="1252.0" y="232.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1308.0" y="232.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1252" y="232" />
+        <di:waypoint xsi:type="dc:Point" x="1308" y="232" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1271.0" y="232.0"/>
+          <dc:Bounds x="1271" y="232" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_167" bpmnElement="ScriptTask_4">
-        <dc:Bounds height="80.0" width="100.0" x="72.0" y="420.0"/>
+        <dc:Bounds x="72" y="420" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_168" bpmnElement="ScriptTask_5">
-        <dc:Bounds height="80.0" width="100.0" x="239.0" y="420.0"/>
+        <dc:Bounds x="239" y="420" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_169" bpmnElement="ScriptTask_6">
-        <dc:Bounds height="80.0" width="100.0" x="535.0" y="420.0"/>
+        <dc:Bounds x="535" y="420" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_ScriptTask_167" targetElement="_BPMNShape_ScriptTask_168">
-        <di:waypoint xsi:type="dc:Point" x="172.0" y="460.0"/>
-        <di:waypoint xsi:type="dc:Point" x="239.0" y="460.0"/>
+        <di:waypoint xsi:type="dc:Point" x="172" y="460" />
+        <di:waypoint xsi:type="dc:Point" x="239" y="460" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="197.0" y="460.0"/>
+          <dc:Bounds x="197" y="460" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_16" bpmnElement="SequenceFlow_16" sourceElement="_BPMNShape_ExclusiveGateway_88" targetElement="_BPMNShape_ScriptTask_167">
-        <di:waypoint xsi:type="dc:Point" x="1064.0" y="256.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1064.0" y="351.0"/>
-        <di:waypoint xsi:type="dc:Point" x="122.0" y="351.0"/>
-        <di:waypoint xsi:type="dc:Point" x="122.0" y="420.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1064" y="256" />
+        <di:waypoint xsi:type="dc:Point" x="1064" y="351" />
+        <di:waypoint xsi:type="dc:Point" x="122" y="351" />
+        <di:waypoint xsi:type="dc:Point" x="122" y="420" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="22.0" x="1073.0" y="271.0"/>
+          <dc:Bounds x="1073" y="271" width="22" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_17" bpmnElement="SequenceFlow_17" sourceElement="_BPMNShape_ScriptTask_166" targetElement="_BPMNShape_ScriptTask_167">
-        <di:waypoint xsi:type="dc:Point" x="1358.0" y="272.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1358.0" y="352.0"/>
-        <di:waypoint xsi:type="dc:Point" x="639.0" y="352.0"/>
-        <di:waypoint xsi:type="dc:Point" x="122.0" y="352.0"/>
-        <di:waypoint xsi:type="dc:Point" x="122.0" y="420.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1358" y="272" />
+        <di:waypoint xsi:type="dc:Point" x="1358" y="352" />
+        <di:waypoint xsi:type="dc:Point" x="639" y="352" />
+        <di:waypoint xsi:type="dc:Point" x="122" y="352" />
+        <di:waypoint xsi:type="dc:Point" x="122" y="420" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="927.0" y="352.0"/>
+          <dc:Bounds x="927" y="352" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_170" bpmnElement="ScriptTask_7">
-        <dc:Bounds height="80.0" width="100.0" x="684.0" y="420.0"/>
+        <dc:Bounds x="684" y="420" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_ScriptTask_169" targetElement="_BPMNShape_ScriptTask_170">
-        <di:waypoint xsi:type="dc:Point" x="635.0" y="460.0"/>
-        <di:waypoint xsi:type="dc:Point" x="684.0" y="460.0"/>
+        <di:waypoint xsi:type="dc:Point" x="635" y="460" />
+        <di:waypoint xsi:type="dc:Point" x="684" y="460" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="648.0" y="460.0"/>
+          <dc:Bounds x="648" y="460" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_171" bpmnElement="ScriptTask_8">
-        <dc:Bounds height="80.0" width="100.0" x="996.0" y="420.0"/>
+        <dc:Bounds x="996" y="420" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_172" bpmnElement="ScriptTask_9">
-        <dc:Bounds height="80.0" width="100.0" x="1176.0" y="420.0"/>
+        <dc:Bounds x="1176" y="420" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_21" sourceElement="_BPMNShape_ScriptTask_171" targetElement="_BPMNShape_ScriptTask_172">
-        <di:waypoint xsi:type="dc:Point" x="1096.0" y="460.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1176.0" y="460.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1096" y="460" />
+        <di:waypoint xsi:type="dc:Point" x="1176" y="460" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1133.0" y="460.0"/>
+          <dc:Bounds x="1133" y="460" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_173" bpmnElement="ScriptTask_10">
-        <dc:Bounds height="80.0" width="100.0" x="466.0" y="636.0"/>
+        <dc:Bounds x="466" y="636" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_174" bpmnElement="ScriptTask_11">
-        <dc:Bounds height="80.0" width="100.0" x="624.0" y="636.0"/>
+        <dc:Bounds x="624" y="636" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_22" bpmnElement="SequenceFlow_24" sourceElement="_BPMNShape_ScriptTask_172" targetElement="_BPMNShape_ScriptTask_219">
-        <di:waypoint xsi:type="dc:Point" x="1226.0" y="500.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1226.0" y="576.0"/>
-        <di:waypoint xsi:type="dc:Point" x="194.0" y="576.0"/>
-        <di:waypoint xsi:type="dc:Point" x="194.0" y="636.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1226" y="500" />
+        <di:waypoint xsi:type="dc:Point" x="1226" y="576" />
+        <di:waypoint xsi:type="dc:Point" x="194" y="576" />
+        <di:waypoint xsi:type="dc:Point" x="194" y="636" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="821.0" y="576.0"/>
+          <dc:Bounds x="821" y="576" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_25" bpmnElement="SequenceFlow_25" sourceElement="_BPMNShape_ScriptTask_173" targetElement="_BPMNShape_ScriptTask_174">
-        <di:waypoint xsi:type="dc:Point" x="566.0" y="676.0"/>
-        <di:waypoint xsi:type="dc:Point" x="624.0" y="676.0"/>
+        <di:waypoint xsi:type="dc:Point" x="566" y="676" />
+        <di:waypoint xsi:type="dc:Point" x="624" y="676" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="591.0" y="676.0"/>
+          <dc:Bounds x="591" y="676" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_175" bpmnElement="ScriptTask_12">
-        <dc:Bounds height="80.0" width="100.0" x="804.0" y="636.0"/>
+        <dc:Bounds x="804" y="636" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_176" bpmnElement="ScriptTask_13">
-        <dc:Bounds height="80.0" width="100.0" x="984.0" y="636.0"/>
+        <dc:Bounds x="984" y="636" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_26" bpmnElement="SequenceFlow_26" sourceElement="_BPMNShape_ScriptTask_174" targetElement="_BPMNShape_ScriptTask_175">
-        <di:waypoint xsi:type="dc:Point" x="724.0" y="676.0"/>
-        <di:waypoint xsi:type="dc:Point" x="804.0" y="676.0"/>
+        <di:waypoint xsi:type="dc:Point" x="724" y="676" />
+        <di:waypoint xsi:type="dc:Point" x="804" y="676" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="695.0" y="674.0"/>
+          <dc:Bounds x="695" y="674" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_27" bpmnElement="SequenceFlow_27" sourceElement="_BPMNShape_ScriptTask_175" targetElement="_BPMNShape_ScriptTask_176">
-        <di:waypoint xsi:type="dc:Point" x="904.0" y="676.0"/>
-        <di:waypoint xsi:type="dc:Point" x="984.0" y="676.0"/>
+        <di:waypoint xsi:type="dc:Point" x="904" y="676" />
+        <di:waypoint xsi:type="dc:Point" x="984" y="676" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="902.0" y="676.0"/>
+          <dc:Bounds x="902" y="676" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_162" bpmnElement="EndEvent_1">
-        <dc:Bounds height="36.0" width="36.0" x="1208.0" y="906.0"/>
+        <dc:Bounds x="1208" y="906" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="50.0" x="1201.0" y="947.0"/>
+          <dc:Bounds x="1201" y="947" width="50" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_SubProcess_21" bpmnElement="SubProcess_1" isExpanded="true">
-        <dc:Bounds height="198.0" width="475.0" x="239.0" y="924.0"/>
+        <dc:Bounds x="239" y="924" width="475" height="198" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_179" bpmnElement="ScriptTask_16">
-        <dc:Bounds height="80.0" width="100.0" x="399.0" y="984.0"/>
+        <dc:Bounds x="399" y="984" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_163" bpmnElement="EndEvent_3">
-        <dc:Bounds height="36.0" width="36.0" x="617.0" y="1006.0"/>
+        <dc:Bounds x="617" y="1006" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="635.0" y="1047.0"/>
+          <dc:Bounds x="635" y="1047" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_ScriptTask_179" targetElement="_BPMNShape_EndEvent_163">
-        <di:waypoint xsi:type="dc:Point" x="499.0" y="1024.0"/>
-        <di:waypoint xsi:type="dc:Point" x="617.0" y="1024.0"/>
+        <di:waypoint xsi:type="dc:Point" x="499" y="1024" />
+        <di:waypoint xsi:type="dc:Point" x="617" y="1024" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="555.0" y="1024.0"/>
+          <dc:Bounds x="555" y="1024" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_46" bpmnElement="BoundaryEvent_1">
-        <dc:Bounds height="36.0" width="36.0" x="696.0" y="1005.0"/>
+        <dc:Bounds x="696" y="1005" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="711.0" y="1046.0"/>
+          <dc:Bounds x="711" y="1046" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_164" bpmnElement="EndEvent_5">
-        <dc:Bounds height="36.0" width="36.0" x="814.0" y="1005.0"/>
+        <dc:Bounds x="814" y="1005" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="832.0" y="1046.0"/>
+          <dc:Bounds x="832" y="1046" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_36" bpmnElement="SequenceFlow_36" sourceElement="_BPMNShape_BoundaryEvent_46" targetElement="_BPMNShape_EndEvent_164">
-        <di:waypoint xsi:type="dc:Point" x="732.0" y="1023.0"/>
-        <di:waypoint xsi:type="dc:Point" x="814.0" y="1023.0"/>
+        <di:waypoint xsi:type="dc:Point" x="732" y="1023" />
+        <di:waypoint xsi:type="dc:Point" x="814" y="1023" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="770.0" y="1023.0"/>
+          <dc:Bounds x="770" y="1023" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_56" bpmnElement="StartEvent_3">
-        <dc:Bounds height="36.0" width="36.0" x="305.0" y="1006.0"/>
+        <dc:Bounds x="305" y="1006" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="323.0" y="1047.0"/>
+          <dc:Bounds x="323" y="1047" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_StartEvent_56" targetElement="_BPMNShape_ScriptTask_179">
-        <di:waypoint xsi:type="dc:Point" x="341.0" y="1024.0"/>
-        <di:waypoint xsi:type="dc:Point" x="399.0" y="1024.0"/>
+        <di:waypoint xsi:type="dc:Point" x="341" y="1024" />
+        <di:waypoint xsi:type="dc:Point" x="399" y="1024" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="302.0" y="1084.0"/>
+          <dc:Bounds x="302" y="1084" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_180" bpmnElement="ScriptTask_17">
-        <dc:Bounds height="80.0" width="100.0" x="1176.0" y="768.0"/>
+        <dc:Bounds x="1176" y="768" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_180" targetElement="_BPMNShape_EndEvent_162">
-        <di:waypoint xsi:type="dc:Point" x="1226.0" y="848.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1226.0" y="906.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1226" y="848" />
+        <di:waypoint xsi:type="dc:Point" x="1226" y="906" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1223.0" y="868.0"/>
+          <dc:Bounds x="1223" y="868" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_219" bpmnElement="ScriptTask_14">
-        <dc:Bounds height="80.0" width="100.0" x="144.0" y="636.0"/>
+        <dc:Bounds x="144" y="636" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_2" bpmnElement="CallActivity_1">
-        <dc:Bounds height="80.0" width="100.0" x="300.0" y="636.0"/>
+        <dc:Bounds x="300" y="636" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_CallActivity_2" targetElement="_BPMNShape_ScriptTask_173">
-        <di:waypoint xsi:type="dc:Point" x="400.0" y="676.0"/>
-        <di:waypoint xsi:type="dc:Point" x="466.0" y="676.0"/>
+        <di:waypoint xsi:type="dc:Point" x="400" y="676" />
+        <di:waypoint xsi:type="dc:Point" x="466" y="676" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="431.0" y="676.0"/>
+          <dc:Bounds x="431" y="676" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ScriptTask_219" targetElement="_BPMNShape_ExclusiveGateway_213">
-        <di:waypoint xsi:type="dc:Point" x="194.0" y="716.0"/>
-        <di:waypoint xsi:type="dc:Point" x="195.0" y="793.0"/>
-        <di:waypoint xsi:type="dc:Point" x="284.0" y="793.0"/>
-        <di:waypoint xsi:type="dc:Point" x="324.0" y="793.0"/>
+        <di:waypoint xsi:type="dc:Point" x="194" y="716" />
+        <di:waypoint xsi:type="dc:Point" x="195" y="793" />
+        <di:waypoint xsi:type="dc:Point" x="284" y="793" />
+        <di:waypoint xsi:type="dc:Point" x="324" y="793" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="191.0" y="746.0"/>
+          <dc:Bounds x="191" y="746" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_213" bpmnElement="ExclusiveGateway_1" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="324.0" y="768.0"/>
+        <dc:Bounds x="324" y="768" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="349.0" y="823.0"/>
+          <dc:Bounds x="349" y="823" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ExclusiveGateway_213" targetElement="_BPMNShape_CallActivity_2">
-        <di:waypoint xsi:type="dc:Point" x="349.0" y="768.0"/>
-        <di:waypoint xsi:type="dc:Point" x="350.0" y="716.0"/>
+        <di:waypoint xsi:type="dc:Point" x="349" y="768" />
+        <di:waypoint xsi:type="dc:Point" x="350" y="716" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="80.0" x="357.0" y="733.0"/>
+          <dc:Bounds x="357" y="733" width="80" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_18" sourceElement="_BPMNShape_ExclusiveGateway_213" targetElement="_BPMNShape_ScriptTask_173">
-        <di:waypoint xsi:type="dc:Point" x="374.0" y="793.0"/>
-        <di:waypoint xsi:type="dc:Point" x="515.0" y="793.0"/>
-        <di:waypoint xsi:type="dc:Point" x="516.0" y="716.0"/>
+        <di:waypoint xsi:type="dc:Point" x="374" y="793" />
+        <di:waypoint xsi:type="dc:Point" x="515" y="793" />
+        <di:waypoint xsi:type="dc:Point" x="516" y="716" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="97.0" x="380.0" y="768.0"/>
+          <dc:Bounds x="380" y="768" width="97" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_220" bpmnElement="ScriptTask_15">
-        <dc:Bounds height="80.0" width="100.0" x="840.0" y="420.0"/>
+        <dc:Bounds x="840" y="420" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_221" bpmnElement="ScriptTask_18">
-        <dc:Bounds height="80.0" width="100.0" x="384.0" y="420.0"/>
+        <dc:Bounds x="384" y="420" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_168" targetElement="_BPMNShape_ScriptTask_221">
-        <di:waypoint xsi:type="dc:Point" x="339.0" y="460.0"/>
-        <di:waypoint xsi:type="dc:Point" x="384.0" y="460.0"/>
+        <di:waypoint xsi:type="dc:Point" x="339" y="460" />
+        <di:waypoint xsi:type="dc:Point" x="384" y="460" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_221" targetElement="_BPMNShape_ScriptTask_169">
-        <di:waypoint xsi:type="dc:Point" x="484.0" y="460.0"/>
-        <di:waypoint xsi:type="dc:Point" x="535.0" y="460.0"/>
+        <di:waypoint xsi:type="dc:Point" x="484" y="460" />
+        <di:waypoint xsi:type="dc:Point" x="535" y="460" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="511.0" y="460.0"/>
+          <dc:Bounds x="511" y="460" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_22" sourceElement="_BPMNShape_ScriptTask_170" targetElement="_BPMNShape_ScriptTask_220">
-        <di:waypoint xsi:type="dc:Point" x="784.0" y="460.0"/>
-        <di:waypoint xsi:type="dc:Point" x="840.0" y="460.0"/>
+        <di:waypoint xsi:type="dc:Point" x="784" y="460" />
+        <di:waypoint xsi:type="dc:Point" x="840" y="460" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_24" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_ScriptTask_220" targetElement="_BPMNShape_ScriptTask_171">
-        <di:waypoint xsi:type="dc:Point" x="940.0" y="460.0"/>
-        <di:waypoint xsi:type="dc:Point" x="996.0" y="460.0"/>
+        <di:waypoint xsi:type="dc:Point" x="940" y="460" />
+        <di:waypoint xsi:type="dc:Point" x="996" y="460" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_214" bpmnElement="ExclusiveGateway_3" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="965.0" y="206.0"/>
+        <dc:Bounds x="965" y="206" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="990.0" y="261.0"/>
+          <dc:Bounds x="990" y="261" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_215" bpmnElement="IsBaseVfModule" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="770.0" y="206.0"/>
+        <dc:Bounds x="770" y="206" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="795.0" y="261.0"/>
+          <dc:Bounds x="795" y="261" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_285" bpmnElement="QueryAAIVfModule">
-        <dc:Bounds height="80.0" width="100.0" x="849.0" y="72.0"/>
+        <dc:Bounds x="849" y="72" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ScriptTask_164" targetElement="_BPMNShape_ExclusiveGateway_215">
-        <di:waypoint xsi:type="dc:Point" x="724.0" y="232.0"/>
-        <di:waypoint xsi:type="dc:Point" x="747.0" y="232.0"/>
-        <di:waypoint xsi:type="dc:Point" x="747.0" y="231.0"/>
-        <di:waypoint xsi:type="dc:Point" x="770.0" y="231.0"/>
+        <di:waypoint xsi:type="dc:Point" x="724" y="232" />
+        <di:waypoint xsi:type="dc:Point" x="747" y="232" />
+        <di:waypoint xsi:type="dc:Point" x="747" y="231" />
+        <di:waypoint xsi:type="dc:Point" x="770" y="231" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="SequenceFlow_28" sourceElement="_BPMNShape_ExclusiveGateway_215" targetElement="_BPMNShape_ExclusiveGateway_214">
-        <di:waypoint xsi:type="dc:Point" x="820.0" y="231.0"/>
-        <di:waypoint xsi:type="dc:Point" x="965.0" y="231.0"/>
+        <di:waypoint xsi:type="dc:Point" x="820" y="231" />
+        <di:waypoint xsi:type="dc:Point" x="965" y="231" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="888.0" y="231.0"/>
+          <dc:Bounds x="888" y="231" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_29" bpmnElement="SequenceFlow_29" sourceElement="_BPMNShape_ExclusiveGateway_214" targetElement="_BPMNShape_ExclusiveGateway_88">
-        <di:waypoint xsi:type="dc:Point" x="1015.0" y="231.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1039.0" y="231.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1015" y="231" />
+        <di:waypoint xsi:type="dc:Point" x="1039" y="231" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1015.0" y="231.0"/>
+          <dc:Bounds x="1015" y="231" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_30" bpmnElement="SequenceFlow_30" sourceElement="_BPMNShape_ExclusiveGateway_215" targetElement="_BPMNShape_ScriptTask_285">
-        <di:waypoint xsi:type="dc:Point" x="795.0" y="206.0"/>
-        <di:waypoint xsi:type="dc:Point" x="795.0" y="112.0"/>
-        <di:waypoint xsi:type="dc:Point" x="849.0" y="112.0"/>
+        <di:waypoint xsi:type="dc:Point" x="795" y="206" />
+        <di:waypoint xsi:type="dc:Point" x="795" y="112" />
+        <di:waypoint xsi:type="dc:Point" x="849" y="112" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="20.0" x="770.0" y="151.0"/>
+          <dc:Bounds x="770" y="151" width="20" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_34" bpmnElement="SequenceFlow_34" sourceElement="_BPMNShape_ScriptTask_285" targetElement="_BPMNShape_ExclusiveGateway_214">
-        <di:waypoint xsi:type="dc:Point" x="949.0" y="112.0"/>
-        <di:waypoint xsi:type="dc:Point" x="966.0" y="112.0"/>
-        <di:waypoint xsi:type="dc:Point" x="990.0" y="112.0"/>
-        <di:waypoint xsi:type="dc:Point" x="990.0" y="206.0"/>
+        <di:waypoint xsi:type="dc:Point" x="949" y="112" />
+        <di:waypoint xsi:type="dc:Point" x="966" y="112" />
+        <di:waypoint xsi:type="dc:Point" x="990" y="112" />
+        <di:waypoint xsi:type="dc:Point" x="990" y="206" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="987.0" y="136.0"/>
+          <dc:Bounds x="987" y="136" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_286" bpmnElement="ScriptTask_19">
-        <dc:Bounds height="80.0" width="100.0" x="1176.0" y="636.0"/>
+        <dc:Bounds x="1176" y="636" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_176" targetElement="_BPMNShape_ScriptTask_286">
-        <di:waypoint xsi:type="dc:Point" x="1084.0" y="676.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1176.0" y="676.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1084" y="676" />
+        <di:waypoint xsi:type="dc:Point" x="1176" y="676" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1121.0" y="676.0"/>
+          <dc:Bounds x="1121" y="676" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_20" sourceElement="_BPMNShape_ScriptTask_286" targetElement="_BPMNShape_ScriptTask_180">
-        <di:waypoint xsi:type="dc:Point" x="1226.0" y="716.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1226.0" y="768.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1226" y="716" />
+        <di:waypoint xsi:type="dc:Point" x="1226" y="768" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
-</bpmn2:definitions>
\ No newline at end of file
+</bpmn2:definitions>