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
Automatic commit of package [rubygem-openshift-origin-node] release [1.27.4-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.27.4-1].
Automatic commit of package [rubygem-openshift-origin-console] release [1.27.3-1].
Automatic commit of package [openshift-origin-cartridge-nodejs] release [1.28.3-1].
Automatic commit of package [openshift-origin-cartridge-10gen-mms-agent] release [1.34.2-1].
Do not attempt to filter if no conf is provided
Merge pull request #5497 from ncdc/bug/1096155

Merged by openshift-bot
Merge pull request #5569 from derekwaynecarr/only_filter_carts_if_configured

Merged by openshift-bot