SubBatch retry changes
Added some checks
Less verbose
Merge pull request #606 from xschildw/mig-dbg

Mig dbg
Add delete before ins/update, redo if exception raised
Merge pull request #611 from xschildw/delete-before-after

Add delete before ins/update, redo if exception raised
Merge branch 'release-8' into develop