Bug 1039641
Merge pull request #4300 from danmcp/master

Merged by openshift-bot
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.