.......... [ZBX-8919] fixed merge from 2.2
.......... [ZBX-8919] updated ChangeLog