Bug 1088405 - no error message was being given for invalid keys and silently failing
Bug 1088620 - Add check to oo-accept-node for empty OPENSHIFT_PRIMARY_CARTRIDGE_DIR
Merge pull request #5300 from jwhonce/bug/1088620

Merged by openshift-bot
Merge pull request #5297 from lnader/master

Merged by openshift-bot