Merge pull request #579 from fenek/install-timeout-fix

Fix startup error when database install is slow
(cherry picked from commit 3cb8e8d88fdb269a32a2e65f6f88bc914dc9a001)