zabbix integration
Merge branch 'zabbixIntegration2' into dev
zabbix packaging fix