Merge in VECTO/mk_vecto-dev from merge/GUISerialHybrid to develop

* commit 'f0cdfc52':
  Directory.build.targets: Added subdirectory in zip-file
  JSONFileWriter: Added conditional writing of fields for SerialHybrids: IdlingSpeed, AngleDrive, PTO, TorqueLimits, Tanksystem
  JSONFileWriter: Added SaveSerialHybridJob
  JSONFileWriter: Renamed SaveHybridJob to SaveParallelHybridJob
  Directory.props: Removed Trimmable

(cherry picked from commit d47cc724)

JSONFileWriter: Added conditional writing of fields for SerialHybrids: IdlingSpeed, AngleDrive, PTO, TorqueLimits, Tanksystem

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:develop to develop

* commit '1b96b712':
  adding generic serial hybrid vehicles
  bake testcase P4 Hybrid Urban green: disengage ICE during roll action if AllowEmergencyShift is set (i.e. ICE speed is too low), retry roll action in driver model in this case
  correct testcase multistep - airdrag modified multistep expected value

(cherry picked from commit 619be8e954ab058f46fddcacf1e26818784ec6ce)

Merge branch 'develop' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into develop

 bake testcase P4 Hybrid Urban green: disengage ICE during roll action if AllowEmergencyShift is set (i.e. ICE speed is too low), retry roll action in driver model in this case

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:develop to develop

* commit 'e06bcf5a':
  handle the case that there is no next braketrigger speed

Merge branch 'develop' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into develop

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:develop to develop

* commit '60336af3':
  correct comparison in gearshift position after refactoring check if there is a successor/predecessor before checking shift polygon

check if there is a successor/predecessor before checking shift polygon

Merge in VECTO/vecto-dev from VECTO/mk_vecto-dev:bugfix/13-p1-hybrid-apt-s-drivecycle-heavyurban to develop

* commit '1fe5b23c':
  HybridStrategy: vehicleSpeedBelowThreshold only when we actually brake to a halt
  Minor changes in DebugData (Local Variable stores LocalData, but all will also be stored in Global Data)
  ATGearbox: removed NotImplemented comments
  ATGearbox: rewrite of functions for easier debugging
  HybridStrategy: renamed firstResponse to response
  HybridStrategy: replaced EngineSpeedTooLow Variable by direct function evaluation with current response
  HybridStrategy: renamed some response variables in lambda expressions
  debug info
  GearshiftPosition: Minor refactoring (expression bodies)
  DebugData
  better debugging
  More Additions to DebugData
  DebugData: Added global-parameter for easier debugging
  Improved DebugData and DebuggerDisplay Output
  GearboxData: refactored ternary if for easier debugging

Minor changes in DebugData (Local Variable stores LocalData, but all will also be stored in Global Data)

HybridStrategy: replaced EngineSpeedTooLow Variable by direct function evaluation with current response

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:develop to develop

* commit '5b5de25e':
  update testcase with thermal de-rating after changes in em model
  update testcase as the dummy-retarder has been removed
  correcting powertrain builder: building simple parallel powertrain, connect idle controller after powertrain is connected togehter
  update expected values in adas test after changes in clutch (not resetting idel controller on dry-runs)
  update expected values after change in clutch (not calling idle controller on dry-runs)
  fix testcases after refactoring of retarder (removing dummy retarder)

correcting powertrain builder: building simple parallel powertrain, connect idle controller after powertrain is connected togehter

update expected values in adas test after changes in clutch (not resetting idel controller on dry-runs)

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:develop to develop

* commit '42cb52d9':
  update expected values for pcc tests
  adding missing file
  bugfix engineering factory: handle the case no EM is present ;-)