[OR-698] - eventmessage directive - fix tests - v2
Merge pull request #585 in OR/rse from ~PKEWISCH/rse:eventmessage-build-fix to master

* commit '308e4491498c640c4547d22dda4cc171d6386b94':
  [OR-698] - eventmessage directive - fix tests - v2