Revert "Revert "Bring general sketch commits upstream""

Reverts Project-OSRM/osrm-backend#1240

This is an attempt to fix https://github.com/Project-OSRM/osrm-backend/pull/1241 and make github play nice.