Merge branch 'v7-stable' of https://github.com/rsyslog/rsyslog-doc into v7-stable
Merge branch 'v8-stable' of https://github.com/rsyslog/rsyslog-doc into v8-stable
fix error resulting from stunnel.rst move to historical subtree
Merge branch 'v7-stable' into v8-stable
Merge branch 'v8-stable'