Fixes Bug 967504 and Bug 969536 - increased timeout to properly handle some quickstarts