Merge "Update NBI docker for master (Casablanca)"

diff --combined version-manifest/src/main/resources/docker-manifest.csv
index 3117150,112607b..bdbedbb
--- 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
@@@ -25,7 -25,7 +25,7 @@@ onap/cli,2.0.
  onap/data-router,1.2.2
  onap/dmaap/buscontroller,1.0.12
  onap/dmaap/dmaap-mr,1.1.4
- onap/externalapi/nbi,2.1.1
+ onap/externalapi/nbi,3.0.0
  onap/gizmo,1.2.1
  onap/holmes/engine-management,1.1.0
  onap/holmes/rule-management,1.1.0
@@@ -41,8 -41,8 +41,8 @@@ onap/multicloud/vio-vesagent,1.0.
  onap/music/cassandra_music,3.0.0
  onap/music/music,2.5.3
  onap/oom/kube2msb,1.1.0
 -onap/optf-has,1.1.1
 -onap/optf-osdf,1.1.1
 +onap/optf-has,1.2.1
 +onap/optf-osdf,1.2.1
  onap/org.onap.dcaegen2.collectors.snmptrap,1.3.0
  onap/org.onap.dcaegen2.collectors.ves.vescollector,1.2.0
  onap/org.onap.dcaegen2.deployments.bootstrap,1.1.3