Merge proposals dependent on lp://qastaging/charms/trusty/zabbix-server

lp://qastaging/charms/trusty/zabbix-server has no merge proposals.