Merge branch 'develop' into v1.1

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/Main.java

@@ -960,7 +960,7 @@ private static void dispatchServiceWatch(Watch.Response<V1Service> item) {
                   }
                 }
               } else if (clusterName != null) {
-                V1Service oldService = info.getClusters().put(clusterName, null);
+                V1Service oldService = info.getClusters().remove(clusterName);
                 if (oldService != null) {
                   // Service was deleted, but clusters still contained a non-null entry
                   LOGGER.info(

src/integration-tests/bash/run.sh

@@ -557,16 +557,6 @@ function setup_jenkins {
     docker build -t "${IMAGE_NAME_OPERATOR}:${IMAGE_TAG_OPERATOR}" --no-cache=true .
 
     docker images
-
-    trace "Helm installation starts" 
-    wget -q -O  /tmp/helm-v2.7.2-linux-amd64.tar.gz https://kubernetes-helm.storage.googleapis.com/helm-v2.7.2-linux-amd64.tar.gz
-    mkdir /tmp/helm
-    tar xzf /tmp/helm-v2.7.2-linux-amd64.tar.gz -C /tmp/helm
-    chmod +x /tmp/helm/linux-amd64/helm
-    /usr/local/packages/aime/ias/run_as_root "cp /tmp/helm/linux-amd64/helm /usr/bin/"
-    rm -rf /tmp/helm
-    helm init
-    trace "Helm is configured."
 }
 
 # setup_local is for arbitrary dev hosted linux - it assumes docker & k8s are already installed