Automatic commit of package [rubygem-openshift-origin-node] release [1.24.6-1].
Automatic commit of package [openshift-origin-cartridge-jbosseap] release [2.17.5-1].
Automatic commit of package [openshift-origin-cartridge-postgresql] release [1.24.4-1].
Automatic commit of package [openshift-origin-cartridge-mysql] release [1.24.3-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.24.7-1].
Automatic commit of package [openshift-origin-cartridge-jbossas] release [1.24.5-1].
Bug 1094108 - show obsolete carts if ALLOW_OBSOLETE_CARTRIDGES=true
Merge pull request #5378 from lnader/master

Merged by openshift-bot
Fix formatting
Bug 1091433 - Add setting to detune GearStatePlugin

* Add sysconfig/watchman element STATE_CHECK_PERIOD to control
  frequency of running GearStatePlugin
Merge pull request #5382 from danmcp/master

Fix formatting
Merge pull request #5383 from jwhonce/bug/1091433

Merged by openshift-bot
Updated REST API docs version 1.6
Added REST API docs for version 1.7
Merge pull request #5385 from lnader/rest_api_improvements

Merged by openshift-bot
Bug 1094541 - check for null values
Merge pull request #5384 from lnader/master

Merged by openshift-bot
php cart: dynamic, controllable php.d seeding

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

Scan the cart-provided and system `php.d` directories to determine what
php modules are available, and enable them by copying them into the
deployed cartridge's `php.d` directory.

Allow users to enable or disable php modules by setting
`OPENSHIFT_PHP_{MODULENAME}_ENABLE=true/false`

squashed commit: php_module_scan: unbound variable dependency

Obtain PHP version from ident variable `OPENSHIFT_PHP_IDENT`

`php_module_scan` function `scan_php_modules` depended on
`OPENSHIFT_PHP_VERSION` being set, but this isn't necessarily going to
be the case.

Amended `cartridge-lifecycle-php.feature` tests to include checks for
enable/disable PHP module via user env var

Added needed step to `cartridge-php_steps.rb`
php cartridge: remove php .ini locked-* prefix

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

Since these files will no longer be "locked" it doesn't make sense for
them to be prefixed with `locked-`. This involves minor logic tweaks to
the `control` and `php_module_scan` scripts.
rename `scan_php_modules` to `scan_for_php_modules`