SECURITY-742: system property to disable locking
Merge pull request #2 from anilsaldhana/master

see comments