.......PS. [ZBX-8992] made Zabbix prefer the threshold sensor over a discrete sensor, in case both are available under the same name

git-svn-id: svn://svn.zabbix.com/trunk@51009 f4e7fd02-d210-4e34-a1e0-d4093fb66cc2