<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.
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 #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
Merge pull request #2804 from danmcp/master

Merged by openshift-bot
oo-accept-node: fixed cgroups defunct proc bug

Fixed bug in oo-accept-node that caused it to still flag defunct
gear processes as not belonging to cgroups.
Merge pull request #2806 from twiest/dev/twiest/oo-accept-node-cgroup-defunct-fix

Merged by openshift-bot