Corrected merge conflict in PR rgerhards:v8-stable-newglobalparams
Corrected merge conflict in PR rgerhards:v8-stable-newglobalparams

jite/rsyslog-doc,rcuza/rsyslog-doc,teifler/rsyslog-doc,qha/rsyslog-doc,sematext/rsyslog-doc,luozhihui/rsyslog-doc,rcuza/rsyslog-doc,ribeiropaulor/rsyslog-doc,volter/rsyslog-doc,volter/rsyslog-doc,janmejay/rsyslog-doc,luozhihui/rsyslog-doc,mbiebl/rsyslog-doc,janmejay/rsyslog-doc,teifler/rsyslog-doc,jite/rsyslog-doc,qha/rsyslog-doc,rcuza/rsyslog-doc,rcuza/rsyslog-doc,janmejay/rsyslog-doc,mbiebl/rsyslog-doc,mbiebl/rsyslog-doc,Whissi/rsyslog-doc,taotetek/rsyslog-doc,taotetek/rsyslog-doc,teifler/rsyslog-doc,sematext/rsyslog-doc,qha/rsyslog-doc,luozhihui/rsyslog-doc,ribeiropaulor/rsyslog-doc,taotetek/rsyslog-doc,Whissi/rsyslog-doc,volter/rsyslog-doc,taotetek/rsyslog-doc,jite/rsyslog-doc,qha/rsyslog-doc,ribeiropaulor/rsyslog-doc,volter/rsyslog-doc,sematext/rsyslog-doc,Whissi/rsyslog-doc,Whissi/rsyslog-doc,jite/rsyslog-doc,ribeiropaulor/rsyslog-doc,teifler/rsyslog-doc,sematext/rsyslog-doc,janmejay/rsyslog-doc,luozhihui/rsyslog-doc