merge back ubuntu upgrades for rsyslog