.......... [ZBX-7983] updated to latest /branches/2.2 and resolved conflicts