Merge "Fix elasticsearch curator, added second action for events"