Switched to event_incident_type_id

This is for my task - https://www.google-melange.com/gci/task/view/google/gci2014/5246209505624064
This has already been fixed ;), and the other bugs(failed smoke tests) as well.