Zabbix

..F....... [ZBX-21041] fixed broken layout of inherited macros table and added missing column name

Merge in ZBX/zabbix from feature/ZBX-21041-6.0 to release/6.0

* commit 'e3b8969d3adf50869225593820a274ad10d83cb3':
  ..F....... [ZBX-21041] fixed code style
  ..F....... [ZBX-21041] fixed coding style
  ..F....... [ZBX-21041] fixed broken layout of inherited macros table and added missing column name
  ..F....... [ZBX-21041] fixed broken layout of inherited macros table and added missing column name
  ..F....... [ZBX-21041] fixed broken layout of inherited macros table and added missing column name
  ..F....... [ZBX-21041] fixed broken layout of inherited macros table and added missing column name

(cherry picked from commit f69f61087e0ef26ce9badca8c2434bb2ca3260f0)