Ensure that lockfile are defined in a common place

Fixes bug 1158146

Change-Id: I0e986eb16a7ec5b9972a37af583f697ba3624a80