Zabbix

..F....... [ZBXNEXT-7138] updated to latest from master; resolved conflicts in:
- ui/js/common.js
- ui/app/controllers/CControllerUserTokenView.php
- ui/app/views/administration.token.view.php
- ui/app/views/administration.user.token.edit.php
- ui/app/views/administration.user.token.view.php
- ui/app/views/js/administration.token.edit.js.php
- ui/app/views/js/administration.user.token.edit.js.php
- ui/app/controllers/CControllerTokenView.php