tweaks to zabbix setup
Merge branch 'master' into grizzly