better logging of doc update conflicts in case processing and one fix

Case:61447
Merge pull request #68 from dimagi/update-conflicts

better logging of doc update conflicts in case processing and one fix