First pass at removing v1 cartridges
Merge pull request #2856 from danmcp/master

Merged by openshift-bot