fxied bug in chunter locking server.
Merge branch 'test' into dev