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 1011721- Fixed wrong namespace for Cartridge Ruby SDK
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].
Automatic commit of package [openshift-origin-cartridge-jbosseap] release [2.9.2-1].
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.15.3-1].
Automatic commit of package [openshift-origin-cartridge-jbossas] release [1.15.3-1].
Automatic commit of package [openshift-origin-cartridge-nodejs] release [1.16.2-1].
Automatic commit of package [rubygem-openshift-origin-console] release [1.15.4-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.15.3-1].
Automatic commit of package [openshift-origin-cartridge-jbossews] release [1.15.2-1].
Automatic commit of package [rubygem-openshift-origin-frontend-apache-vhost] release [0.1.6-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.15.3-1].
Automatic commit of package [openshift-origin-node-proxy] release [1.15.4-1].
Merge pull request #3703 from mfojtik/bugzilla/1011721

Merged by openshift-bot