Merge branch 'master' into master

Author: markcocker

Jenkinsfile

@@ -214,8 +214,10 @@ pipeline {
                     echo "Install Zowe CLI globaly"
                     sh "rm -f .npmrc"
                     sh("npm set registry https://registry.npmjs.org")
-                    sh("npm set @brightside:registry https://api.bintray.com/npm/ca/brightside/")
-                    sh("npm set @zowe:registry https://api.bintray.com/npm/ca/brightside/")
+                    //sh("npm set @brightside:registry https://api.bintray.com/npm/ca/brightside/")
+                    //sh("npm set @zowe:registry https://api.bintray.com/npm/ca/brightside/")
+                    sh("npm set @zowe:registry https://registry.npmjs.org")
+
                     sh("npm install -g @zowe/cli@latest")
                     sh("zowe --version")
                 }
@@ -596,7 +598,7 @@ pipeline {
                         sh "rm -f .npmrc"
                         sh 'curl -u $USERNAME:$API_KEY https://eu.artifactory.swg-devops.com/artifactory/api/npm/auth/ >> .npmrc'
                         sh "echo registry=$TEST_NPM_REGISTRY >> .npmrc"
-                        sh "echo @zowe:registry=https://api.bintray.com/npm/ca/brightside/ >> .npmrc"
+                        sh "echo @zowe:registry=https://registry.npmjs.org >> .npmrc"
                         sh "echo @zowe:always-auth=false >> .npmrc"
 
                         script {