Add SNI upload support to API
Changed private_certificate to private_ssl_certificate
Fixed merge conflict
Bug 920801
Merge pull request #1633 from lnader/revert_pull_request_1486

Merged by openshift-bot