Fix defects caused by the rebasing-process of threading-PR.
Fix defects caused by the rebasing-process of threading-PR.

done as part of CURA-9356 which may also resolve CURA-8369

Ultimaker/CuraEngine,Ultimaker/CuraEngine