Bug 1039641
Use app config instead of env vars

Switch to using app configuration instead of user env vars for
OPENSHIFT_KEEP_DEPLOYMENTS because we're now laying down
~/.env/OPENSHIFT_KEEP_DEPLOYMENTS for all gears when they're created.
Merge pull request #4300 from danmcp/master

Merged by openshift-bot
Bug 1035176 - openshift-iptables-port-proxy start causes duplicate rules

Updated oo-admin-ctl-iptables-port-proxy start to flush rules prior to
applying them.
Merge pull request #4301 from ncdc/deploy-extended-tests-use-app-config

Merged by openshift-bot
Fix Bugz#960805. Removed comments from JSON.
Made cart names more generic.
Merge pull request #4305 from kraman/bugfix

Merged by openshift-bot
Use app config instead of env vars

Switch to using app configuration instead of user env vars for
OPENSHIFT_DEPLOYMENT_TYPE because we're now laying down
~/.env/OPENSHIFT_DEPLOYMENT_TYPE for all gears when they're created.
Update server.js template to instanciate with new syntax

This removes the following warning on express server startup

Warning: express.createServer() is deprecated, express
applications no longer inherit from http.Server,
please use:

  var express = require("express");
  var app = express();
Merge pull request #4306 from ncdc/deploy-extended-tests-use-app-config

Merged by openshift-bot
Bug 1017536 - Duplication warning messages when creating scalable app with empty git repo
Merge pull request #4309 from motowilliams/update-nodejs-serverjs-template

Merged by openshift-bot
Merge pull request #4310 from jhadvig/dup_message

Merged by openshift-bot
bug 1039824:  The .m2 folder should be created for the existing old jenkins apps
improve rest api docs generation script
Merge pull request #4303 from detiber/bz1035176

Merged by openshift-bot
fixed style for terminal class
Bug 1034555
Merge pull request #4312 from bparees/jenkins_upgrade

Merged by openshift-bot
Update origin_hangouts.csv