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