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

Case:61447