.......PS. [DEV-3956] cleaned up confsync code, fixed timeout logics in snmp
Merge in ZBX/zabbix from feature/DEV-3956-7.0 to release/7.0
* commit 'a373c33eadbd76a7cb32ba0094ab72a1a60987a7':
.......... [DEV-3956] fixed int test
.......PS. [DEV-3956] cleaned up confsync code, fixed timeout logics in snmp
(cherry picked from commit 0fec70b0eb91bc25bda063b3de63f8cfbddde32d)
