Migrate to new shared mlock
Merge pull request #1 from sburnett/master

Migrate to new shared mlock