EPUM instance update conflicts

Fixes OOIION-1108: poor handling of conflicts during instance updates.