Add configurability of lock-timeout setting; default setting now 7 seconds