Zabbix

.D........ [ZBX-15562] added changelog entry; updated to latest from release/4.0; fixed conflicts in:
- ChangeLog
- configure.ac
- frontends/php/include/defines.inc.php
- include/version.h
- src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java