app-admin/rsyslog: Merged changes from portage tree back into overlay