fix bz969724 - feature name is now just cartridge name
Merge branch 'master' of github.com:rajatchopra/origin-server