Fix cartridge dependency dir paths in upgrades
Merge pull request #3941 from ncdc/fix-dependency-dir-upgrades

Merged by openshift-bot