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 1010047 - The http configuration was also needed for an alias with an SSL cert since we get rid of the ServerAlias record for it.
Bug 1008638 - The create step is needed on vhost and other plugins.
Bug 1010461 - Increase supervisor poll_interval

* Increase default supervisor poll_interval to reduce resource usage
typo fix
Added skip_node_ops flag to app/domain/user/district models.

Added 'fix-unresponsive-apps' option to oo-admin-repair script

Fix reserve/unreserve uid in mcollective layer
Use MONGO_TEST_DB=openshift_broker_test for broker tests
oo-admin-repair fixes

oo-admin-repair man page updated
Add rake test for extended integration tests

Added unresponsive app cleanup broker integration tests
Merge pull request #3698 from rmillner/vhost_bugs

Merged by openshift-bot
Merge pull request #3700 from jwhonce/bug/1010461

Merged by openshift-bot
Merge pull request #3702 from rajatchopra/master

Merged by openshift-bot
Merge pull request #3693 from pravisankar/dev/ravi/card98

Merged by openshift-bot
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].