fix: stopping zabbix waits until it's stopped

Change-Id: Iff6bc19dc8ebfebfe5bb4081f740c92d6e8ca00d
Merge "fix: stopping zabbix waits until it's stopped"
Merge branch 'master' of github.com:infochimps-labs/ironfan-pantry