Merged PR 738130: Update some terminology to orchestrator.

Update some terminology to orchestrator.

Author: mpysson

Public/Src/App/Bxl/Args.cs

@@ -2109,9 +2109,6 @@ private void HandleExperimentalOption(
 
             switch (experimentalOptionAndValue.Item1.ToUpperInvariant())
             {
-                case "DONTBRINGOUTPUTSTOMASTER":
-                    // deprecated (no effect)
-                    break;
                 case "USEHARDLINKS":
                     // Deprecated alias: Hardlinks are no longer experimental, so we treat this as an alias for the new /useHardLinks option.
                     engineConfiguration.UseHardlinks = experimentalOptionAndValue.Item2;

Public/Src/Engine/Dll/Distribution/NotifyOrchestratorExecutionLogTarget.cs

@@ -95,7 +95,7 @@ protected override void ReportUnhandledEvent<TEventData>(TEventData data)
         private class NotifyStream : Stream
         {
             /// <summary>
-            /// Threshold over which events are sent to master. 32MB limit
+            /// Threshold over which events are sent to orchestrator. 32MB limit
             /// </summary>
             internal const int EventDataSizeThreshold = 1 << 16; //64kb
                 //1 << 25;

Public/Src/Tools/AdoBuildRunner/Build/BuildExecutor.cs

@@ -108,7 +108,7 @@ public int ExecuteDistributedBuildAsOrchestrator(BuildContext buildContext, stri
             Logger.Info($@"Launching distributed build as orchestrator");
             return ExecuteBuild(
                 ExtractAndEscapeCommandLineArguments(buildArguments) +
-                $" /distributedBuildRole:master" +
+                $" /distributedBuildRole:orchestrator" +
                 $" /distributedBuildServicePort:{Constants.MachineGrpcPort}" +
                 $" /relatedActivityId:{relatedSessionId}",
                 buildContext.SourcesDirectory

Public/Src/Tools/DistributedBuildRunner/Program.cs

@@ -181,7 +181,7 @@ private static bool ConstructCommandLines(uint numberOfWorkers, out string exePa
 
             // Construct the master command line
             InitializeArgs(commandLineBuilder, commonArgs + " " + masterArgs, 0, sourceRootLetter, objectRootLetter, masterCacheRoot);
-            commandLineBuilder.AppendArg("/distributedBuildRole:master");
+            commandLineBuilder.AppendArg("/distributedBuildRole:orchestrator");
 
             var masterPort = GetPortNumber();
             var workerPorts = new List<int>();

Public/Src/Tools/DropDaemon/DropDaemon.cs

@@ -846,7 +846,7 @@ private async Task<IIpcResult> UploadBcdeFileAsync(DropConfig dropConfig)
         }
 
         /// <summary>
-        /// Generates and uploads the Manifest.json on the master using all file hashes computed and stored 
+        /// Generates and uploads the Manifest.json on the orchestrator using all file hashes computed and stored 
         /// by workers using <see cref="VsoClient.RegisterFilesForBuildManifestAsync"/> for the given drop.
         /// Should be called only when DropConfig.GenerateBuildManifest is true.
         /// </summary>