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
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
WIP Cartridge Refactor - Update extended tests for raw environment variables

* Not all tests set @user.namespace