Merge branch 'zabbix-retry' into 'master'

Zabbix retry

See merge request awit-backstep-traceback/awit-backstep-traceback!38
3 jobs for master in 1 minute and 11 seconds (queued for 2 seconds)