Merge pull request #2679 from dubek/rsyslog-upgrade-to-8.18.0