don't fail hard if caching a restore payload raises a doc update conflict

http://manage.dimagi.com/default.asp?82181