Merge "Split out some internal methods in QuorumLockManager for readability"