Bug 989276 - Check for existence of ROOT.war before attempting to copy it
Compare config files in /var/www/openshift, not with /etc.

The file /etc/openshift/plugins.d/openshift-origin-auth-remote-user.conf
contains

   TRUSTED_HEADER="REMOTE_USER"

which can be valid for multiple authentication mechanisms. It does not
however ensure that broker and console will use the same mechanisms.

Addressing
WARN: test_auth_conf_files
        The two authentication configuration file names set up for the console and broker do not match;
        please ensure that they are using the same authentication mechanism.
        Authentication configration files:
        Broker: /etc/openshift/plugins.d/openshift-origin-auth-remote-user.conf

        Console: /var/www/openshift/console/httpd/conf.d/openshift-origin-auth-remote-user-kerberos.conf
Merge branch 'master' of https://github.com/openshift/origin-server into bugzilla/989276
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
Fixing AddCompOp code