Fix the example of erb template
Add missing commit to match rsyslog7-7.4.7-5.5
Create watchThread after rsyslog forks

Move creation of the watchThread to after rsyslog forks, so the thread
isn't terminating when the fork happens.

Fixes bug 1096155
Fix docs typo: `post_install` script references
Fix docs: `setup' script is optional, not mandatory
Document Cartridge Installation Process
"WARNING: Failed to broadcast over UDP" appears in jenkins.log

https://bugzilla.redhat.com/show_bug.cgi?id=993561
mgmt console: describe SYSLOG_ENABLED option

bug 1112838
https://bugzilla.redhat.com/show_bug.cgi?id=1112838

console.conf should include a description of the (commented-out) option
SYSLOG_ENABLED that's mentioned in the admin guide.
Merge pull request #5547 from sosiouxme/bz1112838

Merged by openshift-bot
Bug 1112522: Getting rid of OPENSHIFT_PHPMYADMIN_LOG_DIR.erb in the gear env/ directory
Merge pull request #5548 from jhadvig/phpmyadmin_erb

Merged by openshift-bot
Revert "Bug 1111077 - Ensure frontend and state in sync"
Merge pull request #5551 from jwhonce/revert-5546-bug/1111077

Merged by openshift-bot
Revert "Bug 1112522: Getting rid of OPENSHIFT_PHPMYADMIN_LOG_DIR.erb in the gear env/ directory"
Merge pull request #5554 from jhadvig/bz_1112522_undo

Merged by openshift-bot
php migration hotfix
Merge pull request #5556 from VojtechVitek/php_migration_hotfix

Merged by openshift-bot
Merge pull request #5536 from VojtechVitek/docs_setup_install_order

Merged by openshift-bot
WIP Node Platform - Add reference_id and container_uuid to New Relic report

* Unit tests for MCo Openshift agent
Automatic commit of package [openshift-origin-cartridge-phpmyadmin] release [1.23.1-1].