Node timeout handling improvements
Merge pull request #2789 from ironcladlou/dev/timeouts

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-console] release [1.10.1-5].
Fix php configuration bugs.
Bug 971296: Display mysql environment variables rather than IPs during install
<broker.conf> default to usage db tracking on

As there is little overhead to tracking usage in DB, and it's a
bit of a pain to initialize tracking after an installation is in
use, it seemed easiest to default to tracking for now.
Merge pull request #2792 from ironcladlou/bz/971296

Merged by openshift-bot
Idler whitelist.
Post v2 migration issues - some legacy DNS variables had capitals in them.
The symbolic link for the old cartridge was confusing the websocket test.
Merge pull request #2794 from mrunalp/bugs/php_config_issues

Merged by openshift-bot
Merge pull request #2793 from sosiouxme/usage-by-default

Merged by openshift-bot
Merge pull request #2797 from mrunalp/dev/idler_whitelist

Merged by openshift-bot
Merge pull request #2780 from rmillner/capital_dns

Merged by openshift-bot
Added psych dependency to openshift-console if psych has been split into a separate gem.
Merge pull request #2802 from kraman/master

Merged by openshift-bot
Bug 971876
Merge pull request #2804 from danmcp/master

Merged by openshift-bot