Remove support for deprecated lock format
Merge branch 'deprecatedlock'