Merge remote-tracking branch 'origin/dublin'

merged dublin into master branch

Change-Id: Ifb78d405611b65764fd4f01558b0e703551ed663
Issue-ID: SO-1830
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>

diff --cc adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoMulticloudUtils.java
Simple merge

diff --cc adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/inventory/create/CreateInventoryTask.java
Simple merge

diff --cc adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/inventory/create/CreateInventoryTaskTest.java
index 03622db,c358d3f..8513f30
--- 1/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/inventory/create/CreateInventoryTaskTest.java
--- 2/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/inventory/create/CreateInventoryTaskTest.java
+++ b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/inventory/create/CreateInventoryTaskTest.java
@@@ -10,6 -10,10 +10,10 @@@ import org.mockito.InjectMocks
  import org.mockito.Mock;
  import org.mockito.Mockito;
  import org.mockito.MockitoAnnotations;
 -import org.onap.so.adapters.audit.AAIObjectAudit;
 -import org.onap.so.adapters.audit.AAIObjectAuditList;
+ import org.onap.so.client.graphinventory.GraphInventoryCommonObjectMapperProvider;
++import org.onap.so.objects.audit.AAIObjectAudit;
++import org.onap.so.objects.audit.AAIObjectAuditList;
+ import com.fasterxml.jackson.core.JsonProcessingException;
  
  public class CreateInventoryTaskTest {
  

diff --cc asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCController.java
Simple merge

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