Avoid using workspace lock_path
as relative root
#6157
Merged
lock_path
as relative root
#6157