Replace synchronized by an ReentrantLock in StorageDelegator

[simonpoole]

Use the already existing lock in StorageDelegator instead of synchronized, this allows other parts of the app to determine if the delegator is actually currently locked or not, in particular the rendering code.