Merge "LockManagerGroupFactory to replace singletons"