Make lock timeout configurable. Increase default to 30 seconds