As I mentioned in the commit message, both #getLock and #getAttributeLock were already using the same lock (notice the same #lock member is returned by both methods). There is no change in lock escalation behaviour.

It maybe possible that some operations were only touching attribute lock, but in this case only one lock is involved and using item lock in these operations does not introduce new deadlock.