Cartridge - Clean up manifests

* Add missing elements or remove unused elements
Merge pull request #3313 from jwhonce/wip/manifest_lint

Merged by openshift-bot