WIP Cartridge Refactor - restore test

* verb summary
Merge pull request #2351 from jwhonce/wip/oo-admin-cartridge

Merged by openshift-bot