Adding back cartridge storage functionality.
Merge pull request #285 from jtharris/features/US2438_redux

Merged by openshift-bot