Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks

src/sql/platform/query/common/queryManagement.ts

@@ -20,7 +20,7 @@ export const SERVICE_ID = 'queryManagementService';
 export const IQueryManagementService = createDecorator<IQueryManagementService>(SERVICE_ID);
 
 export interface IQueryManagementService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	onHandlerAdded: Event<string>;
 
@@ -91,7 +91,7 @@ export interface IQueryRequestHandler {
 }
 
 export class QueryManagementService implements IQueryManagementService {
-	public _serviceBrand: any;
+	public _serviceBrand: undefined;
 
 	private _requestHandlers = new Map<string, IQueryRequestHandler>();
 	private _onHandlerAddedEmitter = new Emitter<string>();

src/sql/platform/query/common/queryModel.ts

@@ -47,7 +47,7 @@ export interface IQueryEvent {
  * Interface for the logic of handling running queries and grid interactions for all URIs.
  */
 export interface IQueryModelService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	getQueryRunner(uri: string): QueryRunner;
 

src/sql/platform/query/common/queryModelService.ts

@@ -53,7 +53,7 @@ export class QueryInfo {
  * Handles running queries and grid interactions for all URIs. Interacts with each URI's results grid via a DataService instance
  */
 export class QueryModelService implements IQueryModelService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	// MEMBER VARIABLES ////////////////////////////////////////////////////
 	private _queryInfoMap: Map<string, QueryInfo>;