Merge "Update multicloud version 1.2.2"

diff --combined version-manifest/src/main/resources/docker-manifest-staging.csv
index 30df68f,d32685e..a1a5777
--- 1/version-manifest/src/main/resources/docker-manifest-staging.csv
--- 2/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@@ -53,11 -53,11 +53,11 @@@ onap/model-loader,1.3-STAGING-lates
  onap/msb/msb_apigateway,1.2.2-STAGING-latest
  onap/msb/msb_discovery,1.2.2-STAGING-latest
  onap/multicloud/azure,1.2.2-SNAPSHOT
- onap/multicloud/framework,1.2.2-STAGING
- onap/multicloud/openstack-newton,1.2.2-STAGING
- onap/multicloud/openstack-ocata,1.2.2-STAGING
- onap/multicloud/openstack-pike,1.2.2-STAGING
- onap/multicloud/openstack-windriver,1.2.2-STAGING
+ onap/multicloud/framework,1.2.3-STAGING
+ onap/multicloud/openstack-newton,1.2.3-STAGING
+ onap/multicloud/openstack-ocata,1.2.3-STAGING
+ onap/multicloud/openstack-pike,1.2.3-STAGING
+ onap/multicloud/openstack-windriver,1.2.3-STAGING
  onap/multicloud/vio,1.2.2-STAGING
  onap/multicloud/vio-vesagent,1.0.0
  onap/music/cassandra_3_11,3.0.24
@@@ -135,18 -135,18 +135,18 @@@ onap/tproxy-config,2.1-STAGING-lates
  onap/usecase-ui,1.2.2-STAGING-latest
  onap/usecase-ui-server,1.2.1-STAGING-latest
  onap/validation,1.3-STAGING-latest
 -onap/vfc/catalog,1.2.1-STAGING-latest
 -onap/vfc/db,1.2.1-STAGING-latest
 +onap/vfc/catalog,1.2.2-STAGING-latest
 +onap/vfc/db,1.2.2-STAGING-latest
  onap/vfc/emsdriver,1.2.1-STAGING-latest
 -onap/vfc/gvnfmdriver,1.2.1-STAGING-latest
 +onap/vfc/gvnfmdriver,1.2.2-STAGING-latest
  onap/vfc/jujudriver,1.2.1-STAGING-latest
  onap/vfc/multivimproxy,1.2.1-STAGING-latest
  onap/vfc/nfvo/svnfm/huawei,1.2.1-STAGING-latest
  onap/vfc/nfvo/svnfm/nokia,1.1.0-STAGING-latest
  onap/vfc/nfvo/svnfm/nokiav2,1.3.1-STAGING-latest
 -onap/vfc/nslcm,1.2.1-STAGING-latest
 +onap/vfc/nslcm,1.2.2-STAGING-latest
  onap/vfc/resmanagement,1.2.1-STAGING-latest
 -onap/vfc/vnflcm,1.2.1-STAGING-latest
 +onap/vfc/vnflcm,1.2.2-STAGING-latest
  onap/vfc/vnfmgr,1.2.1-STAGING-latest
  onap/vfc/vnfres,1.2.1-STAGING-latest
  onap/vfc/wfengine-activiti,1.2.0-STAGING-latest

diff --combined version-manifest/src/main/resources/docker-manifest.csv
index 4c925a8,62f78db..fe1a5ea
--- 1/version-manifest/src/main/resources/docker-manifest.csv
--- 2/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@@ -53,11 -53,11 +53,11 @@@ onap/model-loader,1.3.
  onap/msb/msb_apigateway,1.2.1
  onap/msb/msb_discovery,1.2.1
  onap/multicloud/azure,1.2.1
- onap/multicloud/framework,1.2.1
- onap/multicloud/openstack-newton,1.2.1
- onap/multicloud/openstack-ocata,1.2.1
- onap/multicloud/openstack-pike,1.2.1
- onap/multicloud/openstack-windriver,1.2.1
+ onap/multicloud/framework,1.2.2
+ onap/multicloud/openstack-newton,1.2.2
+ onap/multicloud/openstack-ocata,1.2.2
+ onap/multicloud/openstack-pike,1.2.2
+ onap/multicloud/openstack-windriver,1.2.2
  onap/multicloud/vio,1.2.1
  onap/multicloud/vio-vesagent,1.0.0
  onap/music/cassandra_3_11,3.0.24
@@@ -135,18 -135,18 +135,18 @@@ onap/testsuite,1.3.
  onap/usecase-ui,1.2.2
  onap/usecase-ui-server,1.2.1
  onap/validation,1.3.1
 -onap/vfc/catalog,1.2.1
 -onap/vfc/db,1.2.1
 +onap/vfc/catalog,1.2.2
 +onap/vfc/db,1.2.2
  onap/vfc/emsdriver,1.2.1
 -onap/vfc/gvnfmdriver,1.2.1
 +onap/vfc/gvnfmdriver,1.2.2
  onap/vfc/jujudriver,1.2.1
  onap/vfc/multivimproxy,1.2.1
  onap/vfc/nfvo/svnfm/huawei,1.2.1
  onap/vfc/nfvo/svnfm/nokia,1.1.0
  onap/vfc/nfvo/svnfm/nokiav2,1.3.0
 -onap/vfc/nslcm,1.2.1
 +onap/vfc/nslcm,1.2.2
  onap/vfc/resmanagement,1.2.1
 -onap/vfc/vnflcm,1.2.1
 +onap/vfc/vnflcm,1.2.2
  onap/vfc/vnfmgr,1.2.1
  onap/vfc/vnfres,1.2.1
  onap/vfc/wfengine-activiti,1.2.0

diff --combined version-manifest/src/main/resources/java-manifest.csv
index f7dcaa9,cf4b06a..f88a8fb
--- 1/version-manifest/src/main/resources/java-manifest.csv
--- 2/version-manifest/src/main/resources/java-manifest.csv
+++ b/version-manifest/src/main/resources/java-manifest.csv
@@@ -218,10 -218,10 +218,10 @@@ org.onap.modeling.toscaparsers.nfvparse
  org.onap.msb.java-sdk,msb-java-sdk,1.1.1
  org.onap.msb.swagger-sdk,swagger-sdk,1.1.0
  org.onap.multicloud.azure,multicloud-azure,1.2.1
- org.onap.multicloud.framework,multivimbroker,1.2.1
- org.onap.multicloud.openstack,newton,1.2.1
- org.onap.multicloud.openstack,ocata,1.2.1
- org.onap.multicloud.openstack,windriver,1.2.1
+ org.onap.multicloud.framework,multivimbroker,1.2.2
+ org.onap.multicloud.openstack,newton,1.2.2
+ org.onap.multicloud.openstack,ocata,1.2.2
+ org.onap.multicloud.openstack,windriver,1.2.2
  org.onap.multicloud.openstack.vmware,vesagent,1.0.0
  org.onap.multicloud.openstack.vmware,vio,1.2.1
  org.onap.music,MUSIC,3.0.23
@@@ -247,19 -247,19 +247,19 @@@ org.onap.sdnc.northbound,generic-resour
  org.onap.sdnc.northbound,vnfapi-provider,1.4.2
  org.onap.sdnc.northbound,vnftools-provider,1.4.2
  org.onap.usecase-ui.server,usecase-ui-server,1.2.1
 -org.onap.vfc.gvnfm.vnflcm.lcm,vfc-gvnfm-vnflcm-lcm,1.2.1
 +org.onap.vfc.gvnfm.vnflcm.lcm,vfc-gvnfm-vnflcm-lcm,1.2.2
  org.onap.vfc.gvnfm.vnfmgr.mgr,vfc-gvnfm-vnfmgr-mgr,1.2.1
  org.onap.vfc.gvnfm.vnfres.res,vfc-gvnfm-vnfres-res,1.2.1
 -org.onap.vfc.nfvo.catalog,vfc-nfvo-catalog,1.2.1
 -org.onap.vfc.nfvo.db,vfc-nfvo-db,1.2.1
 +org.onap.vfc.nfvo.catalog,vfc-nfvo-catalog,1.2.2
 +org.onap.vfc.nfvo.db,vfc-nfvo-db,1.2.2
  org.onap.vfc.nfvo.driver.ems.ems,emsdriver-standalone,1.2.1
  org.onap.vfc.nfvo.driver.sfc.zte.sfc-driver-standalone,vfc-nfvo-driver-sfc-zte-sfc-driver,1.2.0
 -org.onap.vfc.nfvo.driver.vnfm.gvnfm.gvnfmadapter,vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter,1.2.1
 +org.onap.vfc.nfvo.driver.vnfm.gvnfm.gvnfmadapter,vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter,1.2.2
  org.onap.vfc.nfvo.driver.vnfm.svnfm,vfcadaptor-deployment,1.1.0
  org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter,hw-vnfmadapter-deployment,1.2.1
  org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2,driverwar,1.2.1
  org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager,vfc-nfvo-driver-vnfm-svnfm-zte-vmanager,1.2.1
 -org.onap.vfc.nfvo.lcm,vfc-nfvo-lcm,1.2.1
 +org.onap.vfc.nfvo.lcm,vfc-nfvo-lcm,1.2.2
  org.onap.vfc.nfvo.multivimproxy,vfc-nfvo-multivimproxy-deployment,1.2.1
  org.onap.vfc.nfvo.resmanagement,vfc-nfvo-resmanagement-deployment,1.2.1
  org.onap.vfc.nfvo.wfengine,activiti-extension,1.2.0