Enable idler in websocket plugin.
node-util: RHBZ#1004512 oo-admin-ctl-gears gearstatus show locked status
Revert "add protocols/types to routing spi"

This reverts commit 2911e1fec10cf385fd1fdf7154323c8d91ef4494.
Revert "fix indexing"

This reverts commit 894e6e6c5174fe33cb217eb317ab83bfa17cea4e.
Revert "First draft of changes to create subclasses for pending ops"

This reverts commit 46a6b57d22881e0d94d99ae89ca55801812def8f.
Revert "use proper return codes in has_web_proxu() bash sdk"

This reverts commit 4d632b4026120b5cfc195b7b34b835716ed6e16f.
Revert "Handle categories not used"

This reverts commit e5e08755636c91bbeed46a3660c9db0969656574.
Revert "fix configure order calculation - bz1008609"

This reverts commit 2ed26ceff2127f3a7a10a87277effb5f0b16dbb4.
Revert "Fix mock cartridge verification in cuke tests"

This reverts commit 554af6dfc61edf3cd542f17828d94a35ce587224.
Revert "cartridges: display the cron install message only on the web_proxy gear in a scaled environment"

This reverts commit 3701783f52c54e314fdaf320c0b86c516a02e5c2.
Revert "node: adding bash sdk function has_web_proxy to check if the gear contains a web_proxy cartridge"

This reverts commit f832bdafc60d2363d0dd4ffcecd691327eaa90ba.
Merge pull request #3677 from rmillner/vhost_bugs

Merged by openshift-bot
Merge pull request #3679 from mmahut/mmahut/ctl_gears_stoplock

Merged by openshift-bot