Merge from vscode e3b9b8eefc062d68ba8a4b6a817162d132f3b533 (#6932)

* Merge from vscode e3b9b8eefc062d68ba8a4b6a817162d132f3b533

* skip failing test

* add comment

build/azure-pipelines/exploration-build.yml

@@ -13,18 +13,28 @@ steps:
   inputs:
     versionSpec: "10.15.1"
 
+- task: AzureKeyVault@1
+  displayName: 'Azure Key Vault: Get Secrets'
+  inputs:
+    azureSubscription: 'vscode-builds-subscription'
+    KeyVaultName: vscode
+
 - script: |
     set -e
 
     cat << EOF > ~/.netrc
+    machine github.com
+    login vscode
+    password $(github-distro-mixin-password)
+    EOF
 
     git config user.email "vscode@microsoft.com"
     git config user.name "VSCode"
 
-    git checkout origin/ben/electron-test
+    git checkout origin/electron-6.0.x
     git merge origin/master
 
     # Push master branch into exploration branch
-    git push origin HEAD:ben/electron-test
+    git push origin HEAD:electron-6.0.x
 
   displayName: Sync & Merge Exploration