Combine stderr/stdout for cartridge actions
Bug 955463: Move hot deploy logic into the v2 model

Consolidate all hot deploy logic into the v2 model to enforce consistency
of application state.
Bug 928621 - needed more information on why the flow does what it does.
Bug 928621 - Detect whether the gear is missing a frontend configuration.
splitting up runtime_other tests
Merge pull request #2227 from ironcladlou/bz/955538

Merged by openshift-bot
Merge pull request #2229 from danmcp/master

Merged by openshift-bot
Card online_runtime_266 - Build PATH from CARTRIDGE_<CARTRIDGE_SHORT_NAME>_PATH

* Refactor OpenShift::Utils::Environ
  * Add path processing
  * Remove for_cartridge method
  * Updated cartridges: jobssews, haproxy, mock
  * Remove V1 gear PATH env var
Card online_runtime_266 - Fix issue with cartridge overrides

* rhcsh was not looping over OPENSHIFT_PRIMARY_CARTRIDGE_DIR/env
* oo-trap-user was eating v1 cartrige settings of PATH
Card online_runtime_266 - Cucumber test checking for removed file
Merge pull request #2223 from ironcladlou/bz/955463

Merged by openshift-bot
Merge pull request #2225 from rmillner/BZ928621

Merged by openshift-bot
Card online_runtime_287 - Add cartridge/usr/template locations

* GIT template search locations:
    * ~/<cartridge home>/template
    * ~/<cartridge home>/template.git
    * ~/<cartridge home>/usr/template
    * ~/<cartridge home>/usr/template.git
Missed a step in teardown
Merge pull request #2211 from jwhonce/wip/cartridge_path

Merged by openshift-bot
Merge pull request #2228 from jwhonce/wip/card287

Merged by openshift-bot
Bug 956561 - No available console log file generated.
Merge pull request #2233 from brenton/BZ956561

Merged by openshift-bot
Bug 956667 - Updated MySQL v2 cart to install with oo-admin-cartridge in %post

https://bugzilla.redhat.com/show_bug.cgi?id=956667

Updated cartridges/openshift-origin-cartridge-mysql/openshift-origin-cartridge-mysql.spec
to install the cartridge with oo-admin-cartridge in %post, this
replicates identical behavior in the other v2 cartridges.
Merge pull request #2235 from detiber/bz956667

Merged by openshift-bot