Merge proposals

rsyslog release team has no merge proposals.