Move timeout functionality into main module

Alex Pottrequested to merge
issue/content_lock-3530509:3530509-merge-contentlocktimeout-into into 3.x

Closes #3530509

Merge request reports