Bug 1117466 - fixes overriding timeout config
Bug 1118712 - fixes ssl version parse when adding new servers
Merge pull request #625 from fabianofranz/bugs/1117466

Merged by openshift-bot
Merge pull request #626 from fabianofranz/bugs/1118712

Merged by openshift-bot