Bug 971176 - Catch cartridge repository issues.
Fix runtime extended tests
Merge pull request #2874 from rmillner/misc_bugs

Merged by openshift-bot
Bug 965804
Merge pull request #2875 from lnader/master

Merged by openshift-bot