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
Merge pull request #3518 from a13m/bugzilla/989276

Merged by openshift-bot