Zabbix

..F....... [ZBXNEXT-2662] updated to the latest trunk

resolved conflicts in:
 - frontends/php/triggers.php
 - frontends/php/trigger_prototypes.php
 - frontends/php/popup.php
 - frontends/php/include/views/configuration.triggers.massupdate.php
 - frontends/php/include/views/configuration.triggers.list.php
 - frontends/php/include/views/configuration.triggers.edit.php
 - frontends/php/include/forms.inc.php
 - frontends/php/include/classes/import/CConfigurationImport.php
 - frontends/php/include/classes/export/CConfigurationExportBuilder.php
 - frontends/php/include/classes/export/CConfigurationExport.php
 - frontends/php/include/classes/api/services/CTriggerPrototype.php