Fix the lock release on stale locks

Alex Pottrequested to merge
issue/content_lock-3598231:3598231-lock-is-not into 3.x

Closes #3598231

Merge request reports