Bug 923561 - Make help match usage
Bug 923559 - Make help match usage

* remove future options
Improve build output to client
PHP build wip.
Merge pull request #1729 from jwhonce/bug/923561

Merged by openshift-bot
WIP Cartridge Refactor - Add new environment variables

* OPENSHIFT_{short name}_IDENT    = {cartridge vendor}:{software name}:{software version}:{cartridge version}
* OPENSHIFT_NAMESPACE             = {namespace}
* OPENSHIFT_PRIMARY_CARTRIDGE_DIR = $OPENSHIFT_HOMEDIR/{cartridge vendor}-{software name} for cartridge on gear categorized as web_framework
Merge pull request #1740 from ironcladlou/dev/v2carts/build-system

Merged by openshift-bot
Fixing force deletion of domain to correctly read apps from primary
Additional fixes to read from the primary
Merge pull request #1742 from danmcp/master

Jenkins v2 WIP
Merge pull request #1741 from mrunalp/dev/php_build_wip

Merged by openshift-bot
WIP Cartridge Refactor - Add new environment variables

* remove obsoleted test
Merge pull request #1732 from abhgupta/abhgupta-dev

Merged by openshift-bot
Merge pull request #1743 from jwhonce/wip/cartridge_ident

Merged by openshift-bot