Enable idler in websocket plugin.
node-util: RHBZ#1004512 oo-admin-ctl-gears gearstatus show locked status
Bug 980515 - Remove extraneous Conflicts element
Bug 1010435 - /health provided by proxy
Fixing AddCompOp code
Fix for bug 1010632
node: adding bash sdk function has_web_proxy to check if the gear contains a web_proxy cartridge
cartridges: display the cron install message only on the web_proxy gear in a scaled environment
Fix mock cartridge verification in cuke tests
fix configure order calculation - bz1008609
Handle categories not used
use proper return codes in has_web_proxu() bash sdk
First draft of changes to create subclasses for pending ops
fix indexing
add protocols/types to routing spi
routing spi changes
Merge pull request #3675 from rajatchopra/master

Merged by openshift-bot
Port ssl_to_gear changes to the frontend plugins.
Revert "add protocols/types to routing spi"

This reverts commit 2911e1fec10cf385fd1fdf7154323c8d91ef4494.
Revert "fix indexing"

This reverts commit 894e6e6c5174fe33cb217eb317ab83bfa17cea4e.