Cartridge - restore mock and mock-plugin cartridge versions
Merge pull request #3479 from jwhonce/latest_cartridge_versions

Merged by openshift-bot