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
Card origin_runtime_102 - use secret token for auth_value in JGroups

* Refactor JBossAS and JBossEAP cartridges to use OPENSHIFT_SECRET_TOKEN
  when building a JGroups cartridge
Merge pull request #3674 from jwhonce/wip/secret_token

Merged by openshift-bot
Report an error if there are no frontend plugins defined.
Bug 1010047 - Change alias handling to that SNI requests do not misroute.
Fix up conflicts in frontend plugins.
Using the geardb was causing missed gears on delete, use the ApplicationContainer object instead.
Bug 1008638 - needed a way to force rebuild the framework cart.
Creating the app secret token
Fixes for pending_op changes
Merge pull request #3671 from rmillner/vhost_bugs

Merged by openshift-bot
Merge pull request #3662 from abhgupta/abhgupta-dev

Merged by openshift-bot
Merge pull request #3676 from abhgupta/abhgupta-scheduler

Merged by openshift-bot
Enable idler in websocket plugin.
node-util: RHBZ#1004512 oo-admin-ctl-gears gearstatus show locked status
Bug 1007455 - Added primary_cartridge methods to Ruby SDK
Added OpenShift::Cartridge::Sdk namespace and removed TODO
Bug 980515 - Remove extraneous Conflicts element
Bug 1010435 - /health provided by proxy