Also add more time for findByIdWithLock case - it must be more than the default timeout of 2.5 seconds. Closes #1727.