Fix finding supervisor pid when starting nodejs
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
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