Description of problem: rsyslog tests are flaking and causing merge problems.
tests have been commented out in master.