Zabbix

.......... [ZBX-13549] updated to the latest trunk; fixed conflicts in:

 - frontends/php/include/defines.inc.php
 - src/libs/zbxdbupgrade/dbupgrade_3050.c
 - create/src/schema.tmpl
 - sass/clock.html (removed)
 - sass/screens-edit.html (removed)
 - frontends/php/tests/selenium/testPageAdministrationAuditActions.php (removed)