Merge pull request #623 from fabianofranz/bugs/1035632

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

Merged by openshift-bot
Bug 1118712 - fixes ssl version parse when adding new servers