WIP Cartridge Refactor -- restore --version to setup calls
Merge pull request #1717 from jwhonce/wip/setup_version

Merged by openshift-bot