Merge from vscode 112fa76c775ecb79ac2c9e9e5dba0d711d523543 (#6388)

package.json

@@ -137,7 +137,11 @@
     "husky": "^0.13.1",
     "innosetup": "5.6.1",
     "is": "^3.1.0",
-    "istanbul": "^0.3.17",
+    "istanbul-lib-coverage": "^2.0.5",
+    "istanbul-lib-instrument": "^3.3.0",
+    "istanbul-lib-report": "^2.0.8",
+    "istanbul-lib-source-maps": "^3.0.6",
+    "istanbul-reports": "^2.2.6",
     "jsdom-no-contextify": "^3.1.0",
     "lazy.js": "^0.4.2",
     "merge-options": "^1.0.1",
@@ -152,7 +156,6 @@
     "pump": "^1.0.1",
     "queue": "3.0.6",
     "rcedit": "^1.1.0",
-    "remap-istanbul": "^0.13.0",
     "rimraf": "^2.2.8",
     "should": "^13.2.3",
     "sinon": "^1.17.2",
@@ -189,4 +192,4 @@
     "windows-mutex": "0.2.1",
     "windows-process-tree": "0.2.4"
   }
-}
+}