Bug 1117466 - fixes overriding timeout config