Merge "bug fix for ccvpn uc after integration test"

author Seshu Kumar M <seshu.kumar.m@huawei.com>

Thu, 20 Sep 2018 10:19:36 +0000 (10:19 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Thu, 20 Sep 2018 10:19:36 +0000 (10:19 +0000)
author Seshu Kumar M <seshu.kumar.m@huawei.com>
Thu, 20 Sep 2018 10:19:36 +0000 (10:19 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Thu, 20 Sep 2018 10:19:36 +0000 (10:19 +0000)
diff --cc bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java
Simple merge
author	Seshu Kumar M <seshu.kumar.m@huawei.com>
	Thu, 20 Sep 2018 10:19:36 +0000 (10:19 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Thu, 20 Sep 2018 10:19:36 +0000 (10:19 +0000)