Merge "lockmanager: make NullLockManager do reference counting for consistency"