Fix stop for httpd-based carts.
Merge pull request #2729 from mrunalp/bugs/carts_httpd_stop

Merged by openshift-bot
fix bz969724 - feature name is now just cartridge name
Merge pull request #2730 from rajatchopra/master

Merged by openshift-bot