Also, I'm not tied to the fix suggested by fixcandidate_01 patch. Please review and critique or change if needed – or send comments and ideas my way.
Also, FYI, I had a two test failures and two test errors in common, but they were unrelated to this patch. The failures were due to the position of the namespace declarations in some XML being checked in an assert. I did not check on the errors, but it looked like NPEs coming from a missing application validator object?? Anyway, this fix patch didn't cause those.