Adapt events-eiffel for stable-3.8

Solves: Jira GER-2331
Change-Id: I9e881327eba05dfefad4a92f4736991fd86d091e