Merge branch 'wa_fqdn2ip'
Merge branch 'fix_rsyslog_develop_rebased'