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

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

diff --cc asdc-controller/src/main/java/org/onap/so/asdc/activity/ActivitySpecsActions.java
index a084ce7,619d894..317296f
--- 1/asdc-controller/src/main/java/org/onap/so/asdc/activity/ActivitySpecsActions.java
--- 2/asdc-controller/src/main/java/org/onap/so/asdc/activity/ActivitySpecsActions.java
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/activity/ActivitySpecsActions.java
@@@ -68,9 -67,10 +68,11 @@@ public class ActivitySpecsActions 
              Response response = httpClient.post(payload);
  
              int statusCode = response.getStatus();
-             if (statusCode != HttpStatus.SC_OK) {
+             if (statusCode == HttpStatus.SC_UNPROCESSABLE_ENTITY) {
 -                logger.warn("{} {} {}", "ActivitySpec", activitySpec.getName(), "already exists in SDC");
++                logger.warn(Strings.repeat("{} ", 3), "ActivitySpec", activitySpec.getName(), "already exists in SDC");
+             } else if (statusCode != HttpStatus.SC_OK && statusCode != HttpStatus.SC_CREATED) {
 -                logger.warn("{} {} {}", "Error creating activity spec", activitySpec.getName(), statusCode);
 +                logger.warn(Strings.repeat("{} ", 3), "Error creating activity spec", activitySpec.getName(),
 +                        statusCode);
              } else {
                  if (response.getEntity() != null) {
                      ActivitySpecCreateResponse activitySpecCreateResponse =
@@@ -110,8 -110,10 +112,11 @@@
  
              int statusCode = response.getStatus();
  
-             if (statusCode != HttpStatus.SC_OK) {
+             if (statusCode == HttpStatus.SC_UNPROCESSABLE_ENTITY) {
 -                logger.warn("{} {} {}", "ActivitySpec with id", activitySpecId, "is already certified in SDC");
++                logger.warn(Strings.repeat("{} ", 3), "ActivitySpec with id", activitySpecId,
++                        "is already certified in SDC");
+             } else if (statusCode != HttpStatus.SC_OK) {
 -                logger.warn("{} {} {}", "Error certifying activity", activitySpecId, statusCode);
 +                logger.warn(Strings.repeat("{} ", 3), "Error certifying activity", activitySpecId, statusCode);
              } else {
                  certificationResult = true;
              }

diff --cc bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy
Simple merge

diff --cc bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java
Simple merge