Zabbix

.......... [ZBXNEXT-8593] synced with upstream, resolved conflicts

The conflict was caused by other dbupgrade patches being added upstream.
Moved the additional patches down in the order and bumped dbversion
required and optional versions to match the patch level.