Bug 1117466 - fixes overriding timeout config
Merge pull request #625 from fabianofranz/bugs/1117466

Merged by openshift-bot