WIP Cartridge Refactor - Process manifest overrides for Broker

* Process the manifest overrides when returning manifests to broker
Merge pull request #2036 from jwhonce/wip/node

Merged by openshift-bot