Zabbix

.......... [ZBXNEXT-5386,ZBXNEXT-5387] updated from latest master; fixed conflicts in:

- frontends/php/app/controllers/CControllerMediatypeCreate.php
- frontends/php/app/controllers/CControllerMediatypeEdit.php
- frontends/php/app/controllers/CControllerMediatypeUpdate.php
- frontends/php/app/views/administration.mediatype.edit.js.php
- frontends/php/app/views/administration.mediatype.edit.php
- frontends/php/include/classes/api/CAudit.php
- frontends/php/include/classes/api/services/CMediatype.php
- frontends/php/include/defines.inc.php
- frontends/php/include/media.inc.php