Automatic merge of T1.6-rc4-32-g196d83e86 and 16 pull requests

- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1091 at aa72c13: Automatic speed control
- Pull request #1110 at 387388e: Fix Activity Runner persists after loading exception
- 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 #1126 at 3bb081e: ShapeHierarchy Attachment for More Wagon Addons
- Pull request #1130 at 251a677: Fix F9 points to an incorrect car ID.
- Pull request #1132 at 934d29e: Fixes For Correct Questionable Braking Parameters
- Pull request #1133 at 8dc00d5: Minor Fix for Brake Pipe Charging
- Pull request #1136 at 6f1b82f: Fix Curve Resistance Calculation
- Pull request #1137 at c2c9e2a: Apply brakes at startup on minimal reduction
- Pull request #1138 at 6397400: Calculate wheel speed in simple adhesion
- Pull request #1082 at 5845a1a: Allow variable water level in glass gauge
- Pull request #1081 at 689494b: Brake cuts power unification
- Pull request #1124 at fab5457: Built-in PBL2 brake controller

Author: openrails-bot

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

@@ -3160,13 +3160,8 @@ public virtual void AdvancedAdhesion(float elapsedClockSeconds)
         public void SimpleAdhesion()
         {
             MotiveForceN = TractiveForceN;
-            // Check if the following few lines are required???
-            if (LocoNumDrvAxles <= 0)
-            {
                 WheelSpeedMpS = AbsSpeedMpS;
-                return;
-            }
-            
+            // Check if the following few lines are required???
             if (LocoNumDrvAxles <= 0)
                 return;