Bug 1110266 - fixes first run of rhc server add
Bug 1110357 - fixes issue with ruby/highline conversion to yaml
Merge pull request #606 from fabianofranz/master

Merged by openshift-bot