Run EPUM controller core tests with ZK store too
Remove last of homegrown Mock object

using mock.Mock everywhere now
Handle conflicts in updating EPUM instance states

Fixes OOIION-1108