Added check to ensure the new cartridge does not clash with existing web_proxy
Bug 1019163
fix bz1006083 - recheck with node if gear is truly gone
Fix bug 1022336: alias lsof to lsof -w
Merge pull request #4100 from lnader/master

Merged by openshift-bot
Merge pull request #4096 from rajatchopra/fix_1006083

Merged by openshift-bot
Merge pull request #4102 from pmorie/bugs/1022336

Merged by openshift-bot
fix bz996952 - use gear_id with ssh key, rather than component_id
Fixing the run_jobs logic for op groups being rolled back
Merge pull request #4084 from rajatchopra/master

Merged by openshift-bot
Merge pull request #4097 from abhgupta/abhgupta-scheduler

Merged by openshift-bot
update for 36 upgrade
Merge pull request #4105 from danmcp/master

Merged by openshift-bot