make lock mode usage consistent
Merge pull request #932 from deeky666/DDC-2919

[DDC-2919] Make lock mode usage consistent