Fixing incorrect if check on APP_VALUES[DS_SSL]
Fix for Bug 901404

* syntax error in bash code
* Added /tmp to directory for mktemp
Bug 902117
fix typo
Merge pull request #1185 from calfonso/master

Merged by openshift-bot
Merge pull request #1186 from jwhonce/dev/bz901404

Merged by openshift-bot
Ensure descriptions for cartridges and application types are safe and limited in the UI.
Automatic commit of package [rubygem-openshift-origin-node] release [1.3.5-1].
Automatic commit of package [openshift-origin-cartridge-jbossews-2.0] release [1.0.8-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.3.7-1].
Automatic commit of package [openshift-origin-node-proxy] release [0.4.3-1].
Automatic commit of package [openshift-origin-cartridge-mongodb-2.2] release [1.3.4-1].
Automatic commit of package [openshift-origin-cartridge-jbosseap-6.0] release [1.3.4-1].
Automatic commit of package [openshift-origin-cartridge-php-5.3] release [1.3.5-1].
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.3.4-1].
Automatic commit of package [openshift-origin-broker-util] release [1.3.5-1].
Automatic commit of package [openshift-origin-cartridge-mysql-5.1] release [1.3.4-1].
Automatic commit of package [openshift-origin-cartridge-nodejs-0.6] release [1.3.4-1].
Automatic commit of package [openshift-origin-node-util] release [1.3.7-1].
Automatic commit of package [openshift-origin-cartridge-diy-0.1] release [1.3.4-1].