Merge branch 'master' into typeToStringViaTypeNode

Author: Arthur Ozga

lib/cancellationToken.js

@@ -49,7 +49,7 @@ function createCancellationToken(args) {
         return {
             isCancellationRequested: function () { return perRequestPipeName_1 !== undefined && pipeExists(perRequestPipeName_1); },
             setRequest: function (requestId) {
-                currentRequestId_1 = currentRequestId_1;
+                currentRequestId_1 = requestId;
                 perRequestPipeName_1 = namePrefix_1 + requestId;
             },
             resetRequest: function (requestId) {