Merge branch 'fix_rsyslog_develop_rebased'