Merge pull request #2139 from smarterclayton/separate_config_from_environments

Merged by openshift-bot
WIP Cartridge Refactor - Change environment variable files to contain just value

* Card#255 Change environment variable files to be named KEY and contain VALUE
* https://trello.com/c/gIldOk6P
Merge pull request #2169 from jwhonce/wip/raw_envvar

Merged by openshift-bot
Bug 952051
Merge pull request #2170 from bdecoste/master

Merged by openshift-bot
fix inclusion of the example manifest
WIP Cartridge Refactor - Card#255 missed env var source in app_helper.rb
Fix typo on miscategorized
Merge pull request #2173 from jwhonce/wip/raw_envvar

Merged by openshift-bot
Merge pull request #2171 from mscherer/fix/doc_cartridge_syntax

Merged by openshift-bot
Merge pull request #2174 from mscherer/patch-1

Merged by openshift-bot
Improve console rest api memory usage by reducing copies