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
Creating the app secret token
Fixes for pending_op changes
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
Fix for bug 1010632
node: adding bash sdk function has_web_proxy to check if the gear contains a web_proxy cartridge
cartridges: display the cron install message only on the web_proxy gear in a scaled environment
Fix mock cartridge verification in cuke tests
fix configure order calculation - bz1008609
Handle categories not used