Fix for [Issue 798] break infinite loop when problems with naming resolution conflict.  Reviewed by gbellato.
The fix is to replay the operation a maximum of 10 times.  There is a unit test for this issue that uses the short-circuit plugin to force the infinite replay loop.