Port DistributedLockManager fix from 3.0