Some corrections and implementations in ShuntingInitiatedByDriver + TrainTrip
Merge remote-tracking branch 'origin/master'