..F....... [ZBX-8896] updated to the latest /trunk, resolved conflicts