Switch calling convention to match US3143
Merge pull request #1203 from rmillner/ssl-calling

Merged by openshift-bot
fix references to rhc app cartridge
Merge pull request #1210 from danmcp/master

Merged by openshift-bot