Jacalvo/simplify events and logs

Linked to QA PR: https://github.com/Zentyal/qa/pull/154