...G...... [ZBX-8327] fixed merging from 2.2 version


git-svn-id: svn://svn.zabbix.com/trunk@47311 f4e7fd02-d210-4e34-a1e0-d4093fb66cc2