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
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
routing spi changes
Port ssl_to_gear changes to the frontend plugins.
Revert "add protocols/types to routing spi"

This reverts commit 2911e1fec10cf385fd1fdf7154323c8d91ef4494.
Revert "fix indexing"

This reverts commit 894e6e6c5174fe33cb217eb317ab83bfa17cea4e.
Revert "First draft of changes to create subclasses for pending ops"

This reverts commit 46a6b57d22881e0d94d99ae89ca55801812def8f.
Revert "use proper return codes in has_web_proxu() bash sdk"

This reverts commit 4d632b4026120b5cfc195b7b34b835716ed6e16f.
Revert "Handle categories not used"

This reverts commit e5e08755636c91bbeed46a3660c9db0969656574.
Revert "fix configure order calculation - bz1008609"

This reverts commit 2ed26ceff2127f3a7a10a87277effb5f0b16dbb4.
Revert "Fix mock cartridge verification in cuke tests"

This reverts commit 554af6dfc61edf3cd542f17828d94a35ce587224.