Automatic merge of T1.6-rc6-37-g6dd094783 and 13 pull requests

- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1104 at 86d38a2: 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 #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID.
- Pull request #1139 at 03c6f8f: Fix for bug https://bugs.launchpad.net/or/+bug/2117357. 
- Pull request #1142 at a24747c: Fix Light Position Calculation for Deeper Hierarchy Levels
- Pull request #1143 at 71e57d2: Status in Work Orders popup set too fast
- 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
- Pull request #1128 at 58de4c3: Particle Emitter Overhaul

Author: openrails-bot

Source/Orts.Simulation/Simulation/Activity.cs

@@ -1377,33 +1377,28 @@ private Train matchesConsist(List<string> wagonIdList)
             return null;
         }
         /// <summary>
-        /// Finds the train that contains exactly the wagons (and maybe loco) in the list. Exact order is not required.
+        /// Finds the train that contains exactly the wagons in the list. Exact order is not required.
         /// </summary>
         /// <param name="wagonIdList"></param>
         /// <returns>train or null</returns>
         private Train matchesConsistNoOrder(List<string> wagonIdList)
         {
             foreach (var trainItem in Simulator.Trains)
             {
-                int nCars = 0;//all cars other than WagonIdList.
-                int nWagonListCars = 0;//individual wagon drop.
+                int nWagonListCars = 0;
                 foreach (var item in trainItem.Cars)
                 {
-                    if (!wagonIdList.Contains(item.CarID)) nCars++;
-                    if (wagonIdList.Contains(item.CarID)) nWagonListCars++;
-                }
-                // Compare two lists to make sure wagons are present.
-                bool listsMatch = true;
-                //support individual wagonIdList drop
-                if (trainItem.Cars.Count - nCars == (wagonIdList.Count == nWagonListCars ? wagonIdList.Count : nWagonListCars))
+                    if (wagonIdList.Contains(item.CarID))
                 {
-                    if (excludesWagons(trainItem, wagonIdList)) listsMatch = false;//all wagons dropped
-                    
-                    if (listsMatch) return trainItem;
-                    
+                        nWagonListCars++;
+                    }
+                    if (nWagonListCars == trainItem.Cars.Count)
+                    {
+                        return trainItem;
+                    }
+                }
                 }
 
-            }
             return null;
         }
         /// <summary>