Adapt events-eiffel for stable-3.5

Solves: Jira GER-1663
Change-Id: Iddf607622f5eb785546cd60a11d727e5b96ab16a