.......... [ZBX-6497] updated to the latest trunk and fixed conflicts in events.php, block.inc.php, tr_status.php, report2.php, jsrpc.php and in menupopup.js