Zabbix

.......... [ZBX-10729] update latest from release/4.2 & resolved conflict in frontends/php/include/classes/helpers/CMapHelper.php

* commit '396c4d29017f997cb41f95312cce165c23f439ff':
  .D........ [ZBX-10729] fixed changelog
  ..F....... [ZBX-10729] fixed map element link coloring when linked problem is acknowledged
  ..F....... [ZBX-10729] fixed filtering of minimal severity for map links
  .......... [ZBX-10729] created development branch

(cherry picked from commit c1a4dfbe9bbed4c0a7a2b812367d06544ee66ac3)