Commits
![Andrejs Kozlovs](https://secure.gravatar.com/avatar/231728f15050c994c78452bf774b4f65.jpg?s=96&d=mm)
Andrejs Kozlovs authored 689557c32a5
...G...... [ZBXNEXT-7408] fixed merge errors Merge in ZBX/zabbix from feature/ZBXNEXT-7408-5.0 to release/5.0 * commit 'db3bb390d575caec5e9c90e5c5fcef27deb9bb3f': ...G...... [ZBXNEXT-7408] fixed merge errors (cherry picked from commit fbc17ebf34769021dae7e1438ab77d0cca40ebba)