Merge "update bb input setup to handle replace for"

diff --cc bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java
index 472a51e,d506c78..6afceac
--- 1/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java
--- 2/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java
@@@ -1431,12 -1444,9 +1444,12 @@@ public class BBInputSetup implements Ja
              }
              String productFamilyId = requestDetails.getRequestInfo().getProductFamilyId();
              String applicationId = "";
 +            if (vnfs.getApplicationId() != null) {
 +                applicationId = vnfs.getApplicationId();
 +            }
              this.populateGenericVnf(vnfs.getModelInfo(), vnfs.getInstanceName(), vnfs.getPlatform(),
                      vnfs.getLineOfBusiness(), service, bbName, serviceInstance, lookupKeyMap, null, vnfId, vnfType,
-                     vnfs.getInstanceParams(), productFamilyId, applicationId);
+                     vnfs.getInstanceParams(), productFamilyId, applicationId, false);
  
          } else if (bbName.contains(PNF)) {
              String pnfId = lookupKeyMap.get(ResourceKey.PNF);