fix lockfiles to have relative paths
Merge branch 'cleanup' into dev