Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks

src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts

@@ -730,29 +730,29 @@ suite('TelemetryService', () => {
 		let service = new TelemetryService({
 			appender: testAppender
 		}, {
-				_serviceBrand: undefined,
-				getValue() {
-					return {
-						enableTelemetry: enableTelemetry
-					} as any;
-				},
-				updateValue(): Promise<void> {
-					return null!;
-				},
-				inspect(key: string) {
-					return {
-						value: getConfigurationValue(this.getValue(), key),
-						default: getConfigurationValue(this.getValue(), key),
-						user: getConfigurationValue(this.getValue(), key),
-						workspace: null!,
-						workspaceFolder: null!
-					};
-				},
-				keys() { return { default: [], user: [], workspace: [], workspaceFolder: [] }; },
-				onDidChangeConfiguration: emitter.event,
-				reloadConfiguration(): Promise<void> { return null!; },
-				getConfigurationData() { return null; }
-			});
+			_serviceBrand: undefined,
+			getValue() {
+				return {
+					enableTelemetry: enableTelemetry
+				} as any;
+			},
+			updateValue(): Promise<void> {
+				return null!;
+			},
+			inspect(key: string) {
+				return {
+					value: getConfigurationValue(this.getValue(), key),
+					default: getConfigurationValue(this.getValue(), key),
+					user: getConfigurationValue(this.getValue(), key),
+					workspace: null!,
+					workspaceFolder: null!
+				};
+			},
+			keys() { return { default: [], user: [], workspace: [], workspaceFolder: [] }; },
+			onDidChangeConfiguration: emitter.event,
+			reloadConfiguration(): Promise<void> { return null!; },
+			getConfigurationData() { return null; }
+		});
 
 		assert.equal(service.isOptedIn, false);