Added check to ensure the new cartridge does not clash with existing web_proxy
Bug 1019163
Merge pull request #4100 from lnader/master

Merged by openshift-bot