Merge remote-tracking branch 'origin/dublin' into 'origin/master'

Change-Id: I2b91332563d9c7b0f469c9e45a35cc1376465c5e
Issue-ID: SO-2058
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

diff --cc adapters/mso-catalog-db-adapter/src/main/resources/db/migration/R__MacroData.sql
Simple merge

diff --cc asdc-controller/src/main/java/org/onap/so/asdc/installer/bpmn/WorkflowResource.java
Simple merge

diff --cc asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java
Simple merge

diff --cc bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java
index 7d5dd95,9420990..fffaee0
--- 1/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java
--- 2/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java
@@@ -111,8 -115,9 +111,9 @@@ public class WorkflowAction 
              "vnfs|vfModules|networks|networkCollections|volumeGroups|serviceInstances|instanceGroups";
      private static final String HOMINGSOLUTION = "Homing_Solution";
      private static final String FABRIC_CONFIGURATION = "FabricConfiguration";
 -    private static final String G_SERVICE_TYPE = "serviceType";
      private static final String SERVICE_TYPE_TRANSPORT = "TRANSPORT";
 +    private static final String SERVICE_TYPE_BONDING = "BONDING";
+     private static final String CLOUD_OWNER = "DEFAULT";
      private static final Logger logger = LoggerFactory.getLogger(WorkflowAction.class);
  
      @Autowired