improved but not yet complete deadlock testing
Merge branch 'master' of github.com:wzheng/lock_service