Reduced Deadlocks

We've redesigned some components of ICM to reduce deadlocks.

These were happening sometimes, especially with information and incident reports when you were saving your changes or creating new entities.