Bug 1160494 - Protect Ops stop_gear from cartridge errors
Bug 1160861 - Prevent both frontends installed at same time
Merge pull request #5937 from jwhonce/bug/1160494

Merged by openshift-bot
Merge pull request #5938 from jwhonce/bug/1160861

Merged by openshift-bot