Zabbix

.......PS. [ZBX-21724] fixed updating of active availability status when active proxy is used

Merge in ZBX/zabbix from feature/ZBX-21724-6.2 to release/6.2

* commit 'c8ce87aa068f40aa6f48bcae5d8cb5b0b9d9b15b':
  .......PS. [ZBX-21724] fixed conflict
  .......PS. [ZBX-21724] fixed updating of active availability status when active proxy is used