Fix finding supervisor pid when starting nodejs
cartridges: displaying the gear uuid to distinguish between gears in a cron scaled environment (RHBZ#1006712)
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
Bug 1008639 - the restore operation is required to put aliases and idler state back.
Allow/Disallow HA capability from oo-admin-ctl-user script
Show user plan in oo-admin-ctl-user output
fix configure order calculation - bz1008609
Handle categories not used
use proper return codes in has_web_proxu() bash sdk
Fix type error, typos in oo-diagnostics test_auth_conf_files

test_auth_conf_files called .join on String types in two
places. Modified code to assign console and broker as Arrays and
expect Arrays in auth type matching logic at end of method.
Merge pull request #3640 from fotioslindiakos/nodejs_fix

Merged by openshift-bot
Merge pull request #3646 from ironcladlou/dev/test-fixes

Merged by openshift-bot
Merge pull request #3649 from rmillner/vhost_bugs

Merged by openshift-bot
Merge pull request #3648 from pravisankar/dev/ravi/misc-fixes

Merged by openshift-bot
Merge pull request #3654 from danmcp/master

Merged by openshift-bot
Rescue OOException and include result_io in message
Merge pull request #3655 from dobbymoodge/fix-oo-diagnostics

Merged by openshift-bot
Merge pull request #3656 from lnader/master

Merged by openshift-bot
Merge pull request #3644 from mmahut/mmahut/cron_dupl_msg

Merged by openshift-bot