vendoring of cartridges
fix some broken tests
Merge pull request #2638 from rajatchopra/master

Merged by openshift-bot