.......... [ZBXNEXT-756] updated to the latest trunk
.......... [ZBXNEXT-756] removed development branch