Fix doubly applied basepaths to lockfiles.
Merge pull request #163 from dandersson/fix_lock_path

Fix doubly applied basepaths to lockfiles.
Merge remote-tracking branch 'upstream/master'