Zabbix

.......... [ZBXNEXT-9731] updated to latest from 'master'

 Conflicts:
       ui/include/classes/validators/CFormValidator.php
       ui/include/defines.inc.php
       ui/tests/selenium/preprocessing/testFormPreprocessingTest.php
       ui/tests/unit/include/classes/validators/CFormValidatorTest.php