Bug 989276 - Check for existence of ROOT.war before attempting to copy it
Merge branch 'master' of https://github.com/openshift/origin-server into bugzilla/989276
Bug 1011721- Fixed wrong namespace for Cartridge Ruby SDK
Add Node.js 0.10 tests to runtime-cartridge-nodejs.feature

Also drop 'v2' designation from Cucumber tags.
Bug 1010723 - Only run lscgroup once for check_users

https://bugzilla.redhat.com/show_bug.cgi?id=1010723

Running lscgroup once per user gets expensive, so run it once and
cache the results.  This is also more in line with how quota info
and other data is gathered in oo-accept-node.
Merge pull request #3691 from BanzaiMan/idle_websockets

Merged by openshift-bot
Merge pull request #3518 from a13m/bugzilla/989276

Merged by openshift-bot
Automatic commit of package [openshift-origin-broker-util] release [1.15.3-1].
Automatic commit of package [openshift-origin-cartridge-jbosseap] release [2.9.2-1].
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.15.3-1].
Automatic commit of package [openshift-origin-cartridge-jbossas] release [1.15.3-1].
Automatic commit of package [openshift-origin-cartridge-nodejs] release [1.16.2-1].
Automatic commit of package [rubygem-openshift-origin-console] release [1.15.4-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.15.3-1].
Automatic commit of package [openshift-origin-cartridge-jbossews] release [1.15.2-1].
Automatic commit of package [rubygem-openshift-origin-frontend-apache-vhost] release [0.1.6-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.15.3-1].
Automatic commit of package [openshift-origin-node-proxy] release [1.15.4-1].
Merge pull request #3703 from mfojtik/bugzilla/1011721

Merged by openshift-bot
Bug 982434 - remove extraneous set_app_info usage

* Cartridges no longer need to send client_message and set_app_info