..F....... [ZBXNEXT-1782] code refactoring
.......... [ZBX-8040] updated to trunk