Cartridge - Clean up manifests

* Add missing elements or remove unused elements
Fix order of upgrade script in cartridge author doc
Merge pull request #3313 from jwhonce/wip/manifest_lint

Merged by openshift-bot
Merge pull request #3314 from pmorie/docfix

Merged by openshift-bot