Merge branch 'stable-3.4'

* stable-3.4:
  Missing "events" namespace in IT tests
  Import events from correct namespace

Change-Id: I11c514dd4ea55701dc040c1f66c6f5316f603283