.......... [ZBX-8582] merge from trunk
.......PS. [ZBX-8542] added user macro cache to support batch resolving of trigger expression user macros