Card online_runtime_239 - Remove env required directory
Bug 956625 - Cleanup some BuildRequires that were added for this bug

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

Added some extraneous BuildRequires, this cleans those BuildRequires up,
cleans up the GemFile and removes a dependency on
/etc/openshift/console.conf needing to be present during build time.
Bug 957095 - V2 support in rhcsh broke USER_VARS

* Restore support for USER_VARS in rhcsh
Merge pull request #2264 from jwhonce/wip/cartridge_from_url

Merged by openshift-bot
Merge pull request #2267 from jwhonce/bug/957095

Merged by openshift-bot
Merge pull request #2265 from detiber/cleanupBuildRequires

Merged by openshift-bot