Zabbix

..F....... [DEV-4886] fixed macro resolving logic by using the existing methods instead of introducing new ones

(cherry picked from commit 54c83a028630e5074424f3177574bfff1a63e47a)