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
"InvalidByteSequenceError" on the first time do jenkins build for app

https://bugzilla.redhat.com/show_bug.cgi?id=1114948
Restrict carts to set of gear sizes
application.rb: allow vim to fix whitespace
broker: add PREVENT_ALIAS_COLLISION option.

https://trello.com/c/ASq1CXyv
Normally when an alias is created, OpenShift validates that it is not
already taken and that it is not of a form that could conflict with an
app name; this prevents problems where the node frontend could have two
destinations for the same URL on the same node and can only route one.
Normally it is obviously desirable to prevent this. But in certain use
cases we want to relax this validation, so this option does that (when
set to false). It is not documented in broker.conf comments because it
should not be used unless you really, really know what you're doing.
removing forum link and replacing with stackoverflow url, and updating newsletter text
Merge pull request #5564 from sosiouxme/relax-alias-validation

Merged by openshift-bot
Merge pull request #5559 from derekwaynecarr/restrict_cart_gear_size

Merged by openshift-bot
Merge pull request #5563 from bparees/jenkins_encoding

Merged by openshift-bot
Bug 1114477: Incorrect pid written into appserver.pid upon python cartridge start action
Merge pull request #5565 from developercorey/add-stack-url

Merged by openshift-bot
Merge pull request #5560 from jhadvig/BZ_1112990

Merged by openshift-bot
Bug 1115321 - Fix zone name in gear_groups rest api responsew
Bug 1115244 - Add 'region' as optional param to ADD_APPLICATION link
Bug 1115238 - Add DEFAULT_REGION_NAME param to the broker configuration.
Bug 1115274 - Fix 'default' field in /regions REST api
Bug 1115309 - Default region will be selected when optional param 'region' is not set during app creation.
Merge pull request #5567 from pravisankar/dev/ravi/fix-region-bugs

Merged by openshift-bot