Template accounts for duplicate sender names

While the sender discovery script can currently differentiate between senders on different servers, the Zabbix template does not. The ID and/or IP associated with a sender should be sent as a macro to Zabbix as part of the discovery so that it can be made a part of the prototype item keys.