Some cleanup of thread locals
Renaming of DistributedLockFactory to DistributedLockService, and all related variables and methods