Cherry-pick cleanup

Author: divman25

Tasks/DockerV0/container.ts

@@ -34,14 +34,13 @@ connection.open(tl.getInput("dockerHostEndpoint"), registryAuthenticationToken);
 var action = tl.getInput("action", true);
 var telemetry = {
     registryType: registryType,
-    command: action
+    command: action !== "Run a Docker command" ? action : tl.getInput("customCommand", true)
 };
 
 console.log("##vso[telemetry.publish area=%s;feature=%s]%s",
     "TaskEndpointId",
     "DockerV0",
     JSON.stringify(telemetry));
-     JSON.stringify(telemetry));
 /* tslint:disable:no-var-requires */
 require({
     "Build an image": "./containerbuild",

Tasks/DockerV1/container.ts

@@ -55,15 +55,6 @@ console.log("##vso[telemetry.publish area=%s;feature=%s]%s",
 
 var commandImplementation = require("./containercommand");
 if (command in dockerCommandMap) {
-    var telemetry = {
-        registryType: registryType,
-        command: command
-    };
-
-    console.log("##vso[telemetry.publish area=%s;feature=%s]%s",
-        "TaskEndpointId",
-        "DockerV1",
-        JSON.stringify(telemetry));
     commandImplementation = require(dockerCommandMap[command]);
 }