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
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
add rails as a BuildRequires for the rpm build, the gemspec now requires it
Merge pull request #5580 from maxamillion/admiller/fix_origin_common_spec

Merged by openshift-bot
add OpenShift Origin build from source instructions
Merge pull request #5545 from a13m/bz1112378

Merged by openshift-bot
Merge pull request #5579 from jhadvig/BZ_1117163

Merged by openshift-bot
Merge pull request #5581 from maxamillion/maxamillion/origin_build_instructions

Merged by openshift-bot