Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c (#8525)

* Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c

* remove files we don't want

* fix hygiene

* update distro

* update distro

* fix hygiene

* fix strict nulls

* distro

* distro

* fix tests

* fix tests

* add another edit

* fix viewlet icon

* fix azure dialog

* fix some padding

* fix more padding issues

cgmanifest.json

@@ -60,12 +60,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "1e50380fab37f407c4d357e1e30ecbc3d5a703b8"
+					"commitHash": "6f62f91822a80192cb711c604f1a8f1a176f328d"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "6.0.12"
+			"version": "6.1.5"
 		},
 		{
 			"component": {
@@ -98,7 +98,7 @@
 				"git": {
 					"name": "vscode-codicons",
 					"repositoryUrl": "https://github.com/microsoft/vscode-codicons",
-					"commitHash": "7f14c092f65f658cd520df3f13765efe828d0ba4"
+					"commitHash": "65d11e0839d0ce09faa1a159dc0b3c0bd1aa50be"
 				}
 			},
 			"license": "MIT and Creative Commons Attribution 4.0",