Merge Container and State mutexes

Resolved all deadlocks and fixed race between kill and monitor.resetContainer

I'm not fully embedded State now, because it'll be huge and not very pleasant for rebase diff.

ping @crosbymichael