Merge branch 'issue/395' into 'master'

SCRUM#395: Fix path to lock files.

See merge request !22
2 jobs for develop in 19 minutes and 18 seconds (queued for 1 second)