nomenclature cleanup and fix for bz958342
Bug 958617 - Add missing env var

* control tidy required OPENSHIFT_JBOSSEWS_LOG_DIR
Merge pull request #2326 from jwhonce/bug/958617

Merged by openshift-bot
Merge pull request #2325 from rajatchopra/master

Merged by openshift-bot