Rebase bugfix_overlap_compensation onto master
Rebase bugfix_overlap_compensation onto master

Contributes to issue CURA-1911.

alephobjects/CuraEngine,totalretribution/CuraEngine,Ultimaker/CuraEngine,alephobjects/CuraEngine,alephobjects/CuraEngine,ROBO3D/CuraEngine,ROBO3D/CuraEngine,totalretribution/CuraEngine,Ultimaker/CuraEngine,totalretribution/CuraEngine,ROBO3D/CuraEngine