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
Bug 1112378 - Respect OPENSHIFT_CGROUP_SUBSYSTEMS in oo-accept-node
Bug 1115539: Make 10gen cartridge able to embed with scaled application
Merge pull request #5574 from jhadvig/BZ-1115539

Merged by openshift-bot
Bug 1116135 - Add -u to bash sdk pgrep calls

* Since gears can "see" another gears pid files in the /proc filesystem,
  a stale pid file could block a cartridge from starting via the check
  in sdk#process_running()
Merge pull request #5575 from jwhonce/bug/1116135

Merged by openshift-bot
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
fix undefined variable reference
Merge pull request #5576 from bparees/master

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-controller] release [1.27.5-1].
Automatic commit of package [openshift-origin-broker-util] release [1.26.2-1].
Bug 1117163: Fix 10gen-mms-agent action triggering for scaled application