Automatic merge of T1.6-rc8-59-g2eb7441b08 and 11 pull requests

- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1091 at e813c42: Automatic speed control
- Pull request #1104 at 7919243: Handle simple adhesion within the axle module
- Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached
- Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing
- Pull request #1121 at 91d2d26: Manually Override Articulation
- Pull request #1124 at e241a0d: Built-in PBL2 brake controller
- Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID.
- Pull request #1157 at 39cd994: Dynamic brake authorization by TCS
- Pull request #1082 at 5845a1a: Allow variable water level in glass gauge
- Pull request #1128 at 1d7643d: Particle Emitter Overhaul

Author: openrails-bot

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs

@@ -402,8 +402,7 @@ public void Parse(STFReader stf)
                     case "modeswitchallowedwiththrottlenotatzero": ModeSwitchAllowedWithThrottleNotAtZero = stf.ReadBoolBlock(false); break;
                     case "docomputenumberofaxles": DoComputeNumberOfAxles = stf.ReadBoolBlock(false); break;
                     case "speeddeltafunctionmode":
-                        stf.MustMatch("(");
-                        var speedDeltaMode = stf.ReadString();
+                        var speedDeltaMode = stf.ReadStringBlock("");
                         try
                         {
                             SpeedDeltaFunctionMode = (SpeedDeltaMode)Enum.Parse(typeof(SpeedDeltaMode), speedDeltaMode, true);
@@ -853,7 +852,11 @@ public void UpdateSpeedRegulatorModeChanges()
             }
             if (ForceRegulatorAutoWhenNonZeroSpeedSelected)
             {
-                if (zeroSelectedSpeed && (!ASCSpeedTakesPriorityOverSpeedSelector || !ASCSetSpeedMpS.HasValue))
+                if (ASCSpeedTakesPriorityOverSpeedSelector && ASCSetSpeedMpS.HasValue)
+                {
+                    SpeedRegMode = SpeedRegulatorMode.Auto;
+                }
+                else if (zeroSelectedSpeed)
                 {
                     SpeedRegMode = SpeedRegulatorMode.Manual;
                 }