fixes and flakes
Merge pull request #727 from inc0/feature/cmdb-zabbix-fix

LGTM