Fix error message
Bug 987155
Merge pull request #3315 from jwhonce/bug/986838

Merged by openshift-bot
Bug 980820 - Cartridge Overriding PATH
Merge pull request #3317 from pmorie/bugs/987155

Merged by openshift-bot
Merge pull request #3318 from jwhonce/bug/980820

Merged by openshift-bot
Automatic commit of package [openshift-origin-cartridge-jbossews] release [0.8.1-1].
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.13.1-1].
Automatic commit of package [openshift-origin-cartridge-10gen-mms-agent] release [1.27.1-1].
Automatic commit of package [openshift-origin-cartridge-cron] release [1.11.1-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.13.1-1].
Automatic commit of package [openshift-origin-cartridge-mysql] release [0.7.1-1].
Automatic commit of package [openshift-origin-cartridge-nodejs] release [1.14.1-1].
Automatic commit of package [openshift-origin-cartridge-haproxy] release [0.8.1-1].
Automatic commit of package [openshift-origin-broker-util] release [1.13.1-1].
Automatic commit of package [rubygem-openshift-origin-common] release [1.13.1-1].
Automatic commit of package [openshift-origin-cartridge-postgresql] release [0.6.1-1].
Automatic commit of package [rubygem-openshift-origin-auth-remote-user] release [1.13.1-1].
Automatic commit of package [openshift-origin-cartridge-jbossas] release [1.6.1-1].
Automatic commit of package [openshift-origin-cartridge-ruby] release [0.8.1-1].