Zabbix

.......... [ZBXNEXT-82] updated to latest from /master; resolved conflicts in:
# create/src/schema.tmpl
# include/dbschema.h
# src/libs/zbxdbupgrade/dbupgrade_5010.c
# ui/app/controllers/CControllerGuiEdit.php
# ui/app/controllers/CControllerGuiUpdate.php
# ui/app/controllers/CControllerLatest.php
# ui/app/partials/monitoring.latest.view.html.php
# ui/include/defines.inc.php
# ui/include/profiles.inc.php
# ui/include/schema.inc.php
# ui/index_sso.php