Moved locking into the storage adapters.
now with a saner locking api
give the zookeeper integration tests a chance...