........S. [ZBX-7887] stylistic fixes during code review
.......... [ZBX-7448] updated to trunk