.......... [ZBX-8726] updated to latest from /branches/2.4
.......... [ZBX-8860] create new development branch from 2.2