Merge pull request #620 from mkurz/lighthouse-943-patch

[#943] Fix Autotest Connection Refused - Also when Running in test mode