Zabbix

A......PS. [ZBXNEXT-3290] added incremental proxy configuration sync

Merge in ZBX/zabbix from feature/ZBXNEXT-3290-6.3 to master

* commit '34972d8ad7024bd333333e1e2e0b1761ff362e30': (159 commits)
  .......PS. [ZBXNEXT-3290] removed redundant includes
  .......PS. [ZBXNEXT-3290] replaced zbx_get_token_len() function with a macro
  .......... [ZBXNEXT-3290] fixed merge conflict in conf file
  A......... [ZBXNEXT-3290,ZBXNEXT-7921] fixed templated elements such as items, graphs etc. on host being deleted when deleting template without clear; removed duplicate gathering of inherited items
  .D........ [ZBXNEXT-3290,ZBXNEXT-7921] updated message for ChangeLog
  A......... [ZBXNEXT-3290,ZBXNEXT-7921] fixed code style
  ........S. [ZBXNEXT-3290] added proxydata status initialization in the case revision was not changed
  .......PS. [ZBXNEXT-3290] fixed warning
  .......PS. [ZBXNEXT-3290] fixed loglevels for proxy configuration sent/received log messages
  A......... [ZBXNEXT-3290,ZBXNEXT-7921] fixed inability to delete web steps from template linked to host and template itself
  .......P.. [ZBXNEXT-3290] fixed session token parsing
  .......PS. [ZBXNEXT-3290] fixed coding style
  .......PS. [ZBXNEXT-3290] changed empty received configuration size logging level to debug
  .......... [ZBXNEXT-3290] removed duplicated database patch
  A......... [ZBXNEXT-7921] fixed HTTP test dependent items search when deleting HTTP test
  .......PS. [ZBXNEXT-3290] fixed coding style issues
  .......PS. [ZBXNEXT-3290] moved proxyconfig reading/writing into server/proxy directories
  .......PS. [ZBXNEXT-3290] changed default configuration sync frequency for server and proxy to 10s
  .......P.. [ZBXNEXT-3290] updated deprecated ConfigFrequency parameter handling
  .......P.. [ZBXNEXT-3290] handle creation of empty template hosts when server sent template macros without host-template links
  ...