[TO_STAGE] Bug 1086854 - Add timeout when locking operations