Increase database lock timeout to avoid lock errors
Merge pull request #588 from tdonohue/DS-1408

DS-1408 : Increase database lock timeout to avoid lock errors