Fix: Correct Double Discovery IP

This will break zabbix_agentd if unchecked

Squashed commit of the following:

commit 7418772251f5eec1e63d50c2e6b8e91cb08b107d
Author: Travis Dempsey <travis@infochimps.com>
Date:   Mon Mar 24 15:41:13 2014 -0500

    uniq discovered zabbix servers

    Change-Id: Ie5938b3f633a911da0518847af9331864cb7f038

Change-Id: I7cb0b959e8a420151afcbc5e645f00eba7a2600f