Allow customizing the content-type and accept headers for oauth calls
Merge pull request #5680 from jwforres/oauth_custom_headers

Merged by openshift-bot
BZ1047469 - PHP cart: fixes pear package upgrade and downgrade messages

It checks the versions of currently installed and
desired packages. It prints a helpful message
about clean build if the user would like to downgrade
a package.
Bug 1123587 - Added OPENSHIFT_POSTGRESQL_DATESTYLE env var
Merge pull request #5682 from mfojtik/datestyle

Merged by openshift-bot
BZ1047469 - PHP cart pear downgrade enhancement: exit when it's failed
Merge pull request #5681 from vbalazs/bvarga/bz_1047469_pear_package_upgrade_fail_message

Merged by openshift-bot
Update mongo env var documentation
Merge pull request #5684 from kevinconaway/master

Merged by openshift-bot
Update URL to oo-diagnostics in docs.

oo-diagnostics has been moved from util to commin/bin.
Github now uses githubusercontent.com to serve some content.
Bug 1123587 - Updated postgresql-8.2 to support OPENSHIFT_POSTGRESQL_DATESTYLE
Merge pull request #5687 from mfojtik/postgresql_82_datestyle

Merged by openshift-bot
Merge pull request #5686 from sajmoon/5662-update-url-in-docs

Merged by openshift-bot
app_info.rb: fix whitespace
oo-app-info: don't assume rhcloud.com app domain

Bug 1123944 - oo-app-info does not find gears / users based on app fqdn
https://bugzilla.redhat.com/show_bug.cgi?id=1123944

The search for an app fqdn was poorly implemented, as it assumed the
domain on the fqdn is rhcloud.com. This change generalizes the search to
use the configured cloud domain in the fqdn.
Merge pull request #5688 from sosiouxme/bz1123944

Merged by openshift-bot
Test improvements that were affecting enterprise test scenarios

- Remove hardcoding of disabling districts for
  broker/test/functional_ext/removed_nodes_app_fixup_test.rb

- Delete test user on teardown for
  admin-console/test/functional/admin_console/api/search/users_controller_test.rb

- Remove the not-enterprise tag from
  controller/test/cucumber/runtime-cartridge-mongodb.feature
Merge pull request #5685 from detiber/fixBrokerExtended

Merged by openshift-bot