Merge remote-tracking branch 'origin/master' into OZG-3184-ConditionalCertIssuer

Jenkinsfile

@@ -212,7 +212,7 @@ String generateHelmChartVersion() {
         chartVersion += "-${env.BRANCH_NAME}"
     }
 
-    return chartVersion
+    return chartVersion.replaceAll("_", "-")
 }
 
 Void sendFailureMessage() {
@@ -245,7 +245,7 @@ Void setNewProvisioningVersion(String environment) {
 
         envVersions.versions.afm_adapter.image.tag = IMAGE_TAG
         envVersions.versions.fs_adapter.image.tag = IMAGE_TAG
-        // envVersions.charts.intelliform_adapter.version = HELM_CHART_VERSION
+        envVersions.charts.intelliform_adapter.version = HELM_CHART_VERSION
 
 
         writeYaml file: envFile, data: envVersions, overwrite: true