.......... [ZBXNEXT-1782] updated to the latest trunk; resolved conflicts in src/libs/zbxdbupgrade/dbupgrade_2030.c