.......... [ZBXNEXT-282] updated to the latest trunk; resoved conflicts in configuration.httpconf.edit.php