Bug 1121067 - Updated error messages
Bug 1121864 - Cleanup OPENSHIFT_PRIMARY_CARTRIDGE_DIR
Merge pull request #5656 from jwhonce/bug/1121067

Merged by openshift-bot